diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/array_of_integers/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/array_of_integers/Computer Policies/Category1 Display Name/policy-simple.md
index 3ddb533a8..222f018bf 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/array_of_integers/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/array_of_integers/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-array-decimal         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-array-decimal         |
 | Element type | multiText |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/array_of_strings/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/array_of_strings/Computer Policies/Category1 Display Name/policy-simple.md
index 568234d10..29643c8ff 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/array_of_strings/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/array_of_strings/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-array-string         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-array-string         |
 | Element type | multiText |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/basic_key/Computer Policies/Category1 Display Name/no-options.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/basic_key/Computer Policies/Category1 Display Name/no-options.md
index 80ed7b860..851c05372 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/basic_key/Computer Policies/Category1 Display Name/no-options.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/basic_key/Computer Policies/Category1 Display Name/no-options.md	
@@ -7,10 +7,11 @@ description
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-no-options         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-no-options         |
 | Element type |  |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/boolean/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/boolean/Computer Policies/Category1 Display Name/policy-simple.md
index cc7af12ff..c1def0764 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/boolean/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/boolean/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-boolean         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-boolean         |
 | Element type | boolean |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/choices/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/choices/Computer Policies/Category1 Display Name/policy-simple.md
index 7ec21d0f3..229e158c6 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/choices/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/choices/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -9,7 +9,7 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 Supported on Ubuntu 20.04
 
-## Valid values
+<span style="font-size: larger;">**Valid values**</span>
 
 * Choice 1
 * Choice 2
@@ -17,10 +17,11 @@ Supported on Ubuntu 20.04
 * Choice 4
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-choices         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-choices         |
 | Element type | dropdownList |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/choices_with_default/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/choices_with_default/Computer Policies/Category1 Display Name/policy-simple.md
index 713f85a97..3fa7da4cc 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/choices_with_default/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/choices_with_default/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,7 +11,7 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 Supported on Ubuntu 20.04, 18.04
 
-## Valid values
+<span style="font-size: larger;">**Valid values**</span>
 
 * Choice 1
 * Choice 2
@@ -19,10 +19,11 @@ Supported on Ubuntu 20.04, 18.04
 * Choice 4
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-choices         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-choices         |
 | Element type | dropdownList |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal/Computer Policies/Category1 Display Name/policy-decimal.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal/Computer Policies/Category1 Display Name/policy-decimal.md
index c9b756de0..7449ae215 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal/Computer Policies/Category1 Display Name/policy-decimal.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal/Computer Policies/Category1 Display Name/policy-decimal.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-decimal         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-decimal         |
 | Element type | decimal |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_max_only/Computer Policies/Category1 Display Name/policy-decimal-with-range.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_max_only/Computer Policies/Category1 Display Name/policy-decimal-with-range.md
index 08df1987a..b2f224ad5 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_max_only/Computer Policies/Category1 Display Name/policy-decimal-with-range.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_max_only/Computer Policies/Category1 Display Name/policy-decimal-with-range.md	
@@ -9,17 +9,18 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 Supported on Ubuntu 20.04
 
-## Valid range
+<span style="font-size: larger;">**Valid range**</span>
 
 * Min: 
 * Max: 15000.000000
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-decimal-with-range         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-decimal-with-range         |
 | Element type | decimal |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_min_only/Computer Policies/Category1 Display Name/policy-decimal-with-range.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_min_only/Computer Policies/Category1 Display Name/policy-decimal-with-range.md
index 2e633aed2..ca4221d98 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_min_only/Computer Policies/Category1 Display Name/policy-decimal-with-range.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_min_only/Computer Policies/Category1 Display Name/policy-decimal-with-range.md	
@@ -9,17 +9,18 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 Supported on Ubuntu 20.04
 
-## Valid range
+<span style="font-size: larger;">**Valid range**</span>
 
 * Min: -123.000000
 * Max: 
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-decimal-with-range         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-decimal-with-range         |
 | Element type | decimal |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_range/Computer Policies/Category1 Display Name/policy-decimal-with-range.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_range/Computer Policies/Category1 Display Name/policy-decimal-with-range.md
index 071c584d7..5bbfb9f3b 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_range/Computer Policies/Category1 Display Name/policy-decimal-with-range.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/decimal_with_range/Computer Policies/Category1 Display Name/policy-decimal-with-range.md	
@@ -9,17 +9,18 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 Supported on Ubuntu 20.04
 
-## Valid range
+<span style="font-size: larger;">**Valid range**</span>
 
 * Min: -123.000000
 * Max: 15000.000000
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-decimal-with-range         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-decimal-with-range         |
 | Element type | decimal |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/double/Computer Policies/Category1 Display Name/policy-double.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/double/Computer Policies/Category1 Display Name/policy-double.md
index c45f2bf1a..79cbb991d 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/double/Computer Policies/Category1 Display Name/policy-double.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/double/Computer Policies/Category1 Display Name/policy-double.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-double         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-double         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/double_with_range/Computer Policies/Category1 Display Name/policy-double.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/double_with_range/Computer Policies/Category1 Display Name/policy-double.md
index 233df31bf..a2eb752e2 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/double_with_range/Computer Policies/Category1 Display Name/policy-double.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/double_with_range/Computer Policies/Category1 Display Name/policy-double.md	
@@ -9,17 +9,18 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 Supported on Ubuntu 20.04
 
-## Valid range
+<span style="font-size: larger;">**Valid range**</span>
 
 * Min: 123.000000
 * Max: 15000.000000
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-double         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-double         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/long_decimal/Computer Policies/Category1 Display Name/policy-long-decimal.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/long_decimal/Computer Policies/Category1 Display Name/policy-long-decimal.md
index de5d71ab1..04db33327 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/long_decimal/Computer Policies/Category1 Display Name/policy-long-decimal.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/long_decimal/Computer Policies/Category1 Display Name/policy-long-decimal.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-long-decimal         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-long-decimal         |
 | Element type | longDecimal |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_categories/Computer Policies/Category1 Display Name/policy-multiple1.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_categories/Computer Policies/Category1 Display Name/policy-multiple1.md
index 558b18155..07fef6f7c 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_categories/Computer Policies/Category1 Display Name/policy-multiple1.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_categories/Computer Policies/Category1 Display Name/policy-multiple1.md	
@@ -9,10 +9,11 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-multiple1         |
+| Location     |  Policies -> Category1 Display Name -> summary 1    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-multiple1         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_categories/Computer Policies/Category2 Display Name/policy-multiple2.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_categories/Computer Policies/Category2 Display Name/policy-multiple2.md
index 51200ae1a..ad094e56c 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_categories/Computer Policies/Category2 Display Name/policy-multiple2.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_categories/Computer Policies/Category2 Display Name/policy-multiple2.md	
@@ -9,10 +9,11 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-multiple2         |
+| Location     |  Policies -> Category2 Display Name -> summary 2    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-multiple2         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_for_one_key/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_for_one_key/Computer Policies/Category1 Display Name/policy-simple.md
index ca399f7a1..1f9983ae7 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_for_one_key/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_for_one_key/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04, 18.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_all_widgets_and_different_defaults/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_all_widgets_and_different_defaults/Computer Policies/Category1 Display Name/policy-simple.md
index c5a00bfac..c809b92e3 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_all_widgets_and_different_defaults/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_all_widgets_and_different_defaults/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -17,10 +17,11 @@ Supported on Ubuntu textrelease, multitextrelease, longdecimalrelease, dropdownl
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_choices/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_choices/Computer Policies/Category1 Display Name/policy-simple.md
index 9ab25594a..b0f7bdd96 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_choices/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_choices/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,7 +11,7 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 Supported on Ubuntu 20.04, 18.04
 
-## Valid values
+<span style="font-size: larger;">**Valid values**</span>
 
 * Choice 11
 * Choice 12
@@ -19,10 +19,11 @@ Supported on Ubuntu 20.04, 18.04
 * Choice 14
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | dropdownList |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_ranges/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_ranges/Computer Policies/Category1 Display Name/policy-simple.md
index 7e80c1970..4a1a652d5 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_ranges/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_ranges/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,17 +11,18 @@ Note: default system value is used for "Not Configured" and enforced if "Disable
 
 Supported on Ubuntu 20.04, 18.04
 
-## Valid range
+<span style="font-size: larger;">**Valid range**</span>
 
 * Min: -20.000000
 * Max: 20.000000
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | decimal |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_widgettype/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_widgettype/Computer Policies/Category1 Display Name/policy-simple.md
index 332bb3283..6961a8883 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_widgettype/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/multiple_releases_with_different_widgettype/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -13,10 +13,11 @@ Supported on Ubuntu 20.04, 18.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/Category with User and Computer/policy-child-computer.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/Category with User and Computer/policy-child-computer.md
index 7941a0555..a5580660c 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/Category with User and Computer/policy-child-computer.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/Category with User and Computer/policy-child-computer.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-child-computer         |
+| Location     |  Policies -> Parent Category Display Name -> Category with User and Computer -> summary child computer    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-child-computer         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/Child Category Display Name Computer/policy-computer.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/Child Category Display Name Computer/policy-computer.md
index d63ce2a94..8699dae0d 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/Child Category Display Name Computer/policy-computer.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/Child Category Display Name Computer/policy-computer.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-computer         |
+| Location     |  Policies -> Parent Category Display Name -> Child Category Display Name Computer -> summary computer    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-computer         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/policy-first.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/policy-first.md
index b00354a6a..fc4a55856 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/policy-first.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/Computer Policies/Parent Category Display Name/policy-first.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-first         |
+| Location     |  Policies -> Parent Category Display Name -> summary first    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-first         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/User Policies/Parent Category Display Name/Category with User and Computer/policy-child-user.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/User Policies/Parent Category Display Name/Category with User and Computer/policy-child-user.md
index a33181e62..728ba444f 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/User Policies/Parent Category Display Name/Category with User and Computer/policy-child-user.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/User Policies/Parent Category Display Name/Category with User and Computer/policy-child-user.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-child-user         |
+| Location     | User Policies -> Parent Category Display Name -> Category with User and Computer -> summary computer    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-child-user         |
 | Element type | text |
 | Class:       | User       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/User Policies/Parent Category Display Name/Child Category Display Name in User/policy-user.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/User Policies/Parent Category Display Name/Child Category Display Name in User/policy-user.md
index d535f4549..8514dd7e8 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/User Policies/Parent Category Display Name/Child Category Display Name in User/policy-user.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories,_classes_and_empty/User Policies/Parent Category Display Name/Child Category Display Name in User/policy-user.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-user         |
+| Location     | User Policies -> Parent Category Display Name -> Child Category Display Name in User -> summary user    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-user         |
 | Element type | text |
 | Class:       | User       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories/Computer Policies/Parent Category Display Name/Child Category Display Name/policy-second.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories/Computer Policies/Parent Category Display Name/Child Category Display Name/policy-second.md
index 774c81ebc..810b739f0 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories/Computer Policies/Parent Category Display Name/Child Category Display Name/policy-second.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories/Computer Policies/Parent Category Display Name/Child Category Display Name/policy-second.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-second         |
+| Location     |  Policies -> Parent Category Display Name -> Child Category Display Name -> summary second    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-second         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories/Computer Policies/Parent Category Display Name/policy-first.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories/Computer Policies/Parent Category Display Name/policy-first.md
index b00354a6a..fc4a55856 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories/Computer Policies/Parent Category Display Name/policy-first.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/nested_categories/Computer Policies/Parent Category Display Name/policy-first.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-first         |
+| Location     |  Policies -> Parent Category Display Name -> summary first    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-first         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_at_all/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_at_all/Computer Policies/Category1 Display Name/policy-simple.md
index 8a12c856d..163692b8a 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_at_all/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_at_all/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_disabled/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_disabled/Computer Policies/Category1 Display Name/policy-simple.md
index 8a12c856d..163692b8a 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_disabled/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_disabled/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_enabled/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_enabled/Computer Policies/Category1 Display Name/policy-simple.md
index 8a12c856d..163692b8a 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_enabled/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/no_meta_enabled/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/simple/Computer Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/simple/Computer Policies/Category1 Display Name/policy-simple.md
index 8a12c856d..163692b8a 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/simple/Computer Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/simple/Computer Policies/Category1 Display Name/policy-simple.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     |  Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/user_policy/User Policies/Category1 Display Name/policy-simple.md b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/user_policy/User Policies/Category1 Display Name/policy-simple.md
index e8ad8eb6f..dd0a6f34d 100644
--- a/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/user_policy/User Policies/Category1 Display Name/policy-simple.md	
+++ b/internal/ad/admxgen/testdata/TestExpandedCategoriesToMD/golden/user_policy/User Policies/Category1 Display Name/policy-simple.md	
@@ -11,10 +11,11 @@ Supported on Ubuntu 20.04
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
+| Location     | User Policies -> Category1 Display Name -> summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\org\gnome\desktop\policy-simple         |
 | Element type | text |
 | Class:       | User       |
diff --git a/internal/ad/admxgen/testdata/TestGenerateDoc/golden/autodetect_overrides_releases_from_yaml/Computer Policies/Category1 Display Name/simple-text-property.md b/internal/ad/admxgen/testdata/TestGenerateDoc/golden/autodetect_overrides_releases_from_yaml/Computer Policies/Category1 Display Name/simple-text-property.md
index 0b85b9cd9..f66627a00 100644
--- a/internal/ad/admxgen/testdata/TestGenerateDoc/golden/autodetect_overrides_releases_from_yaml/Computer Policies/Category1 Display Name/simple-text-property.md	
+++ b/internal/ad/admxgen/testdata/TestGenerateDoc/golden/autodetect_overrides_releases_from_yaml/Computer Policies/Category1 Display Name/simple-text-property.md	
@@ -12,10 +12,11 @@ Supported on Ubuntu 20.04, 21.04, 21.10.
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\com\ubuntu\simple\simple-text-property         |
+| Location     | Computer Policies -> Category1 Display Name -> simple-text-property summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\com\ubuntu\simple\simple-text-property         |
 | Element type | text |
 | Class:       | Machine       |
diff --git a/internal/ad/admxgen/testdata/TestGenerateDoc/golden/releases_from_yaml/Computer Policies/Category1 Display Name/simple-text-property.md b/internal/ad/admxgen/testdata/TestGenerateDoc/golden/releases_from_yaml/Computer Policies/Category1 Display Name/simple-text-property.md
index 0b85b9cd9..f66627a00 100644
--- a/internal/ad/admxgen/testdata/TestGenerateDoc/golden/releases_from_yaml/Computer Policies/Category1 Display Name/simple-text-property.md	
+++ b/internal/ad/admxgen/testdata/TestGenerateDoc/golden/releases_from_yaml/Computer Policies/Category1 Display Name/simple-text-property.md	
@@ -12,10 +12,11 @@ Supported on Ubuntu 20.04, 21.04, 21.10.
 
 
 
-## Metadata
+<span style="font-size: larger;">**Metadata**</span>
 
 | Element      | Value            |
 | ---          | ---              |
-| Key          | Software\Policies\Ubuntu\dconf\com\ubuntu\simple\simple-text-property         |
+| Location     | Computer Policies -> Category1 Display Name -> simple-text-property summary    |
+| Registry Key | Software\Policies\Ubuntu\dconf\com\ubuntu\simple\simple-text-property         |
 | Element type | text |
 | Class:       | Machine       |