diff --git a/windows/client-management/mdm/accountmanagement-csp.md b/windows/client-management/mdm/accountmanagement-csp.md
index 1295c37689..5f2a7ff230 100644
--- a/windows/client-management/mdm/accountmanagement-csp.md
+++ b/windows/client-management/mdm/accountmanagement-csp.md
@@ -21,7 +21,7 @@ AccountManagement CSP is used to configure setting in the Account Manager servic
 
 The following shows the AccountManagement configuration service provider in tree format.
 
-```
+```console
 ./Vendor/MSFT
 AccountManagement
 ----UserProfileManagement
diff --git a/windows/client-management/mdm/appv-deploy-and-config.md b/windows/client-management/mdm/appv-deploy-and-config.md
index 10d60dd882..ac7cb56c39 100644
--- a/windows/client-management/mdm/appv-deploy-and-config.md
+++ b/windows/client-management/mdm/appv-deploy-and-config.md
@@ -25,7 +25,7 @@ manager: dansimp
 
 The following shows the EnterpriseAppVManagement configuration service provider in tree format.
 
-```
+```console
 ./Vendor/MSFT
 EnterpriseAppVManagement
 ----AppVPackageManagement
diff --git a/windows/client-management/mdm/bootstrap-csp.md b/windows/client-management/mdm/bootstrap-csp.md
index de909e2501..7c66f6b36e 100644
--- a/windows/client-management/mdm/bootstrap-csp.md
+++ b/windows/client-management/mdm/bootstrap-csp.md
@@ -23,7 +23,7 @@ The BOOTSTRAP configuration service provider sets the Trusted Provisioning Serve
 
 The following shows the BOOTSTRAP configuration service provider in tree format as used by Open Mobile Alliance (OMA) Client Provisioning. The OMA Device Management protocol is not supported with this configuration service provider.
 
-```
+```console
 BOOTSTRAP
 ----CONTEXT-ALLOW
 ----PROVURL
diff --git a/windows/client-management/mdm/browserfavorite-csp.md b/windows/client-management/mdm/browserfavorite-csp.md
index 9fd7e646d0..bf703c3671 100644
--- a/windows/client-management/mdm/browserfavorite-csp.md
+++ b/windows/client-management/mdm/browserfavorite-csp.md
@@ -30,7 +30,7 @@ This configuration service provider requires the ID\_CAP\_CSP\_FOUNDATION and ID
 
 The following shows the BrowserFavorite configuration service provider in tree format as used by Open Mobile Alliance Device (OMA) Client Provisioning. The OMA Device Management protocol is not supported with this configuration service provider.
 
-```
+```console
 BrowserFavorite
 favorite name
 ----URL
diff --git a/windows/client-management/mdm/cellularsettings-csp.md b/windows/client-management/mdm/cellularsettings-csp.md
index bcedbd2b47..38f858db4d 100644
--- a/windows/client-management/mdm/cellularsettings-csp.md
+++ b/windows/client-management/mdm/cellularsettings-csp.md
@@ -21,7 +21,7 @@ The CellularSettings configuration service provider is used to configure cellula
 
 The following shows the CellularSettings CSP in tree format as used by Open Mobile Alliance Client Provisioning (OMA CP). The OMA DM protocol is not supported with this configuration service provider.
 
-```
+```console
 ./Vendor/MSFT
 CellularSettings
 ----DataRoam
diff --git a/windows/client-management/mdm/cm-cellularentries-csp.md b/windows/client-management/mdm/cm-cellularentries-csp.md
index 208f4e9777..37fa305bce 100644
--- a/windows/client-management/mdm/cm-cellularentries-csp.md
+++ b/windows/client-management/mdm/cm-cellularentries-csp.md
@@ -20,7 +20,7 @@ This configuration service provider requires the ID\_CAP\_NETWORKING\_ADMIN capa
 
 The following shows the CM\_CellularEntries configuration service provider management object in tree format as used by Open Mobile Alliance Client Provisioning (OMA CP). The OMA DM protocol is not supported with this configuration service provider.
 
-```
+```console
 CM_CellularEntries
 ----entryname
 --------AlwaysOn
diff --git a/windows/client-management/mdm/device-update-management.md b/windows/client-management/mdm/device-update-management.md
index 48e51648cb..c4a5bf7384 100644
--- a/windows/client-management/mdm/device-update-management.md
+++ b/windows/client-management/mdm/device-update-management.md
@@ -140,7 +140,7 @@ The enterprise IT can configure auto-update polices via OMA DM using the [Policy
 
 The following shows the Update policies in a tree format.
 
-```
+```console
 ./Vendor/MSFT
 Policy
 ----Config
@@ -713,7 +713,7 @@ Example
 
 The enterprise IT can configure the set of approved updates and get compliance status via OMA DM using the [Update CSP](update-csp.md). The following shows the Update CSP in tree format.
 
-```
+```console
 ./Vendor/MSFT
 Update
 ----ApprovedUpdates
diff --git a/windows/client-management/mdm/deviceinstanceservice-csp.md b/windows/client-management/mdm/deviceinstanceservice-csp.md
index 01e7a81743..a7852e16cc 100644
--- a/windows/client-management/mdm/deviceinstanceservice-csp.md
+++ b/windows/client-management/mdm/deviceinstanceservice-csp.md
@@ -26,7 +26,7 @@ The DeviceInstance CSP is only supported in Windows 10 Mobile.
 
 The following shows the DeviceInstanceService configuration service provider in tree format.
 
-```
+```console
 ./Vendor/MSFT
 DeviceInstanceService
 ------------Roaming
diff --git a/windows/client-management/mdm/devicelock-csp.md b/windows/client-management/mdm/devicelock-csp.md
index f44be7f220..d415155769 100644
--- a/windows/client-management/mdm/devicelock-csp.md
+++ b/windows/client-management/mdm/devicelock-csp.md
@@ -32,7 +32,7 @@ The DevicePasswordEnabled setting must be set to 0 (device password is enabled)
 
 The following shows the DeviceLock configuration service provider in tree format.
 
-```
+```console
 ./Vendor/MSFT
 DeviceLock
 --------Provider
diff --git a/windows/client-management/mdm/enterprise-app-management.md b/windows/client-management/mdm/enterprise-app-management.md
index 19d245c9f4..0f51e05177 100644
--- a/windows/client-management/mdm/enterprise-app-management.md
+++ b/windows/client-management/mdm/enterprise-app-management.md
@@ -41,7 +41,7 @@ These classifications are represented as nodes in the EnterpriseModernAppManagem
 
 The following shows the EnterpriseModernAppManagement CSP in a tree format.
 
-```
+```console
 ./Device/Vendor/MSFT 
 or
 ./User/Vendor/MSFT
diff --git a/windows/client-management/mdm/enterpriseappmanagement-csp.md b/windows/client-management/mdm/enterpriseappmanagement-csp.md
index 60dd892472..f5132cb038 100644
--- a/windows/client-management/mdm/enterpriseappmanagement-csp.md
+++ b/windows/client-management/mdm/enterpriseappmanagement-csp.md
@@ -23,7 +23,7 @@ The EnterpriseAppManagement enterprise configuration service provider is used to
 
 The following shows the EnterpriseAppManagement configuration service provider in tree format.
 
-```
+```console
 ./Vendor/MSFT
 EnterpriseAppManagement
 ----EnterpriseID
diff --git a/windows/client-management/mdm/filesystem-csp.md b/windows/client-management/mdm/filesystem-csp.md
index 0c9b50284b..0b5579a5a6 100644
--- a/windows/client-management/mdm/filesystem-csp.md
+++ b/windows/client-management/mdm/filesystem-csp.md
@@ -24,7 +24,7 @@ The FileSystem configuration service provider is used to query, add, modify, and
 
 The following shows the FileSystem configuration service provider management object in tree format as used by OMA DM. The OMA Client Provisioning protocol is not supported by this configuration service provider.
 
-```
+```console
 ./Vendor/MSFT
 FileSystem
 ----file name
diff --git a/windows/client-management/mdm/hotspot-csp.md b/windows/client-management/mdm/hotspot-csp.md
index b25c013abc..0672037cf9 100644
--- a/windows/client-management/mdm/hotspot-csp.md
+++ b/windows/client-management/mdm/hotspot-csp.md
@@ -27,7 +27,7 @@ The HotSpot configuration service provider is used to configure and enable Inter
 
 The following shows the HotSpot configuration service provider management object in tree format as used by OMA Client Provisioning. The OMA DM protocol is not supported by this configuration service provider.
 
-```
+```console
 ./Vendor/MSFT
 HotSpot
 -------Enabled
diff --git a/windows/client-management/mdm/messaging-csp.md b/windows/client-management/mdm/messaging-csp.md
index 65c50c6386..1e87fad908 100644
--- a/windows/client-management/mdm/messaging-csp.md
+++ b/windows/client-management/mdm/messaging-csp.md
@@ -17,7 +17,7 @@ The Messaging configuration service provider is used to configure the ability to
 
 The following shows the Messaging configuration service provider in tree format.
 
-```
+```console
 ./User/Vendor/MSFT
 Messaging
 ----AuditingLevel
diff --git a/windows/client-management/mdm/napdef-csp.md b/windows/client-management/mdm/napdef-csp.md
index 2cb7275992..bf9a0bc281 100644
--- a/windows/client-management/mdm/napdef-csp.md
+++ b/windows/client-management/mdm/napdef-csp.md
@@ -27,7 +27,7 @@ The NAPDEF configuration service provider is used to add, modify, or delete WAP
 
 The following shows the NAPDEF configuration service provider management object in tree format as used by OMA Client Provisioning for **initial bootstrapping of the phone**. The OMA DM protocol is not supported by this configuration service provider.
 
-```
+```console
 NAPDEF
 ----NAPAUTHINFO
 ------AUTHNAME
@@ -45,7 +45,7 @@ NAPDEF
 
 The following shows the NAPDEF configuration service provider management object in tree format as used by OMA Client Provisioning for **updating the bootstrapping of the phone**. The OMA DM protocol is not supported by this configuration service provider.
 
-```
+```console
 NAPDEF
 --NAPID
 ----NAPAUTHINFO
diff --git a/windows/client-management/mdm/passportforwork-csp.md b/windows/client-management/mdm/passportforwork-csp.md
index 60a2c64092..028da43967 100644
--- a/windows/client-management/mdm/passportforwork-csp.md
+++ b/windows/client-management/mdm/passportforwork-csp.md
@@ -23,7 +23,7 @@ The PassportForWork configuration service provider is used to provision Windows
 
 The following shows the PassportForWork configuration service provider in tree format.
 
-```
+```console
 ./User/Vendor/MSFT
 PassportForWork
 -------TenantId
@@ -46,7 +46,7 @@ PassportForWork
 
 The following shows the PassportForWork configuration service provider in tree format.
 
-```
+```console
 ./Device/Vendor/MSFT
 PassportForWork
 -------TenantId
diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md
index 1f0f4e7068..acf05925b9 100644
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@@ -44,7 +44,7 @@ The Policy configuration service provider has the following sub-categories:
 
 The following shows the Policy configuration service provider in tree format as used by both Open Mobile Alliance Device Management (OMA DM) and OMA Client Provisioning.
 
-```
+```console
 ./Vendor/MSFT
 Policy
 -------Config
diff --git a/windows/client-management/mdm/pxlogical-csp.md b/windows/client-management/mdm/pxlogical-csp.md
index 3caac7b819..1b7b94e690 100644
--- a/windows/client-management/mdm/pxlogical-csp.md
+++ b/windows/client-management/mdm/pxlogical-csp.md
@@ -22,7 +22,7 @@ The PXLOGICAL configuration service provider is used to add, remove, or modify W
 
 The following shows the PXLOGICAL configuration service provider management object in tree format as used by OMA Client Provisioning for initial bootstrapping of the device. The OMA DM protocol is not supported by this configuration service provider.
 
-```
+```console
 PXLOGICAL
 ----DOMAIN
 ----NAME
@@ -47,7 +47,7 @@ PXLOGICAL
 
 The following shows the PXLOGICAL configuration service provider management object in tree format as used by OMA Client Provisioning for updating the bootstrapping of the device. The OMA DM protocol is not supported by this configuration service provider.
 
-```
+```console
 PXLOGICAL
 --PROXY-ID
 ----DOMAIN
diff --git a/windows/client-management/mdm/securitypolicy-csp.md b/windows/client-management/mdm/securitypolicy-csp.md
index 4389216cf8..fbc7a1ec31 100644
--- a/windows/client-management/mdm/securitypolicy-csp.md
+++ b/windows/client-management/mdm/securitypolicy-csp.md
@@ -24,7 +24,8 @@ The SecurityPolicy configuration service provider is used to configure security
 For the SecurityPolicy CSP, you cannot use the Replace command unless the node already exists.
 
 The following shows the SecurityPolicy configuration service provider management object in tree format as used by both OMA DM and OMA Client Provisioning.
-```
+
+```console
 ./Vendor/MSFT
 SecurityPolicy
 ----PolicyID
diff --git a/windows/client-management/mdm/vpn-csp.md b/windows/client-management/mdm/vpn-csp.md
index ef99c4aa65..80121f22ea 100644
--- a/windows/client-management/mdm/vpn-csp.md
+++ b/windows/client-management/mdm/vpn-csp.md
@@ -33,7 +33,7 @@ Important considerations:
 
 The following shows the VPN configuration service provider in tree format.
 
-```
+```console
 ./Vendor/MSFT
 VPN
 -----ProfileName
diff --git a/windows/client-management/mdm/w4-application-csp.md b/windows/client-management/mdm/w4-application-csp.md
index 4c31e6b3d2..de649eb77b 100644
--- a/windows/client-management/mdm/w4-application-csp.md
+++ b/windows/client-management/mdm/w4-application-csp.md
@@ -23,7 +23,7 @@ The default security roles are defined in the root characteristic, and map to ea
 
 The following shows the configuration service provider in tree format as used by OMA Client Provisioning.
 
-```
+```console
 APPLICATION
 ----APPID
 ----NAME
diff --git a/windows/client-management/mdm/w7-application-csp.md b/windows/client-management/mdm/w7-application-csp.md
index b8113fb873..7745749716 100644
--- a/windows/client-management/mdm/w7-application-csp.md
+++ b/windows/client-management/mdm/w7-application-csp.md
@@ -22,7 +22,7 @@ The APPLICATION configuration service provider that has an APPID of w7 is used f
 
 The following shows the configuration service provider in tree format as used by OMA Client Provisioning.
 
-```
+```console
 APPLICATION
 ---APPADDR
 ------ADDR
diff --git a/windows/client-management/mdm/wifi-csp.md b/windows/client-management/mdm/wifi-csp.md
index dfeb5d926f..e6864ea72c 100644
--- a/windows/client-management/mdm/wifi-csp.md
+++ b/windows/client-management/mdm/wifi-csp.md
@@ -31,7 +31,7 @@ Programming considerations:
 
 The following shows the WiFi configuration service provider in tree format.
 
-```
+```console
 ./Device/Vendor/MSFT
 or
 ./User/Vendor/MSFT
diff --git a/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md b/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md
index 2bfea76614..bba543313e 100644
--- a/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md
+++ b/windows/client-management/mdm/windowsadvancedthreatprotection-csp.md
@@ -19,7 +19,7 @@ The Windows Defender Advanced Threat Protection (WDATP) configuration service pr
 
 The following shows the WDATP configuration service provider in tree format as used by the Open Mobile Alliance (OMA) Device Management (DM).
 
-```
+```console
 ./Device/Vendor/MSFT
 WindowsAdvancedThreatProtection
 ----Onboarding