diff --git a/doc/property-doc-generated.md b/doc/property-doc-generated.md
index 900d86d6a..0ae56cfae 100644
--- a/doc/property-doc-generated.md
+++ b/doc/property-doc-generated.md
@@ -839,19 +839,21 @@
       - [CSS 2.1 - z-index](https://drafts.csswg.org/css2/visuren.html#propdef-z-index)
       - [CSS Positioned Layout 3 - z-index](https://drafts.csswg.org/css-position-3/#propdef-z-index)
   - Values: `auto | INT;`
+
 ## [CSS Paged Media 3](http://www.w3.org/TR/css3-page/)
 - [page](http://www.w3.org/TR/css3-page/#page)
+    - Allowed prefixes: epubx
   - TR
       - [CSS Paged Media 3 - page](http://www.w3.org/TR/css3-page/#page)
   - Drafts
       - [CSS Paged Media 3 - page](https://drafts.csswg.org/css-page-3/#propdef-page)
-  - Allowed prefixes: epubx
   - Values: `INT | auto;`
 - [size](http://www.w3.org/TR/css3-page/#size)
   - TR
       - [CSS Paged Media 3 - size](http://www.w3.org/TR/css3-page/#size)
 
   - Values: `POS_LENGTH{1,2} | auto | [ PAGE_SIZE || [ portrait | landscape ] ];`
+
 ## [CSS Color 3](http://www.w3.org/TR/css3-color/)
 - [color](http://www.w3.org/TR/CSS21/colors.html#propdef-color)
   - TR
@@ -869,6 +871,7 @@
       - [CSS Color 3 - opacity](https://drafts.csswg.org/css-color-3/#opacity)
       - [CSS Color 4 - opacity](https://drafts.csswg.org/css-color-4/#propdef-opacity)
   - Values: `NUM;`
+
 ## [CSS Color 4](https://drafts.csswg.org/css-color-4/)
 - [color](http://www.w3.org/TR/CSS21/colors.html#propdef-color)
   - TR
@@ -886,6 +889,7 @@
       - [CSS Color 3 - opacity](https://drafts.csswg.org/css-color-3/#opacity)
       - [CSS Color 4 - opacity](https://drafts.csswg.org/css-color-4/#propdef-opacity)
   - Values: `NUM;`
+
 ## [CSS Backgrounds 3](http://www.w3.org/TR/css3-background/)
 - [background](http://www.w3.org/TR/CSS21/colors.html#propdef-background)
   - TR
@@ -904,11 +908,11 @@
       - [CSS Backgrounds 3 - background-attachment](https://drafts.csswg.org/css-backgrounds-3/#background-attachment)
   - Values: `COMMA( [scroll | fixed | local]+ );`
 - [background-clip](http://www.w3.org/TR/css3-background/#background-clip)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Backgrounds 3 - background-clip](http://www.w3.org/TR/css3-background/#background-clip)
   - Drafts
       - [CSS Backgrounds 3 - background-clip](https://drafts.csswg.org/css-backgrounds-3/#background-clip)
-  - Allowed prefixes: webkit
   - Values: `COMMA( BOX+ );`
 - [background-color](http://www.w3.org/TR/CSS21/colors.html#propdef-background-color)
   - TR
@@ -927,11 +931,11 @@
       - [CSS Backgrounds 3 - background-image](https://drafts.csswg.org/css-backgrounds-3/#background-image)
   - Values: `COMMA( URI_OR_NONE+ );`
 - [background-origin](http://www.w3.org/TR/css3-background/#background-origin)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Backgrounds 3 - background-origin](http://www.w3.org/TR/css3-background/#background-origin)
   - Drafts
       - [CSS Backgrounds 3 - background-origin](https://drafts.csswg.org/css-backgrounds-3/#background-origin)
-  - Allowed prefixes: webkit
   - Values: `COMMA( BOX+ );`
 - [background-position](http://www.w3.org/TR/CSS21/colors.html#propdef-background-position)
   - TR
@@ -951,11 +955,11 @@
       - [CSS Backgrounds 3 - background-repeat](https://drafts.csswg.org/css-backgrounds-3/#background-repeat)
   - Values: `COMMA( [repeat | repeat-x | repeat-y | no-repeat]+ );`
 - [background-size](http://www.w3.org/TR/css3-background/#background-size)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Backgrounds 3 - background-size](http://www.w3.org/TR/css3-background/#background-size)
   - Drafts
       - [CSS Backgrounds 3 - background-size](https://drafts.csswg.org/css-backgrounds-3/#background-size)
-  - Allowed prefixes: webkit
   - Values: `COMMA( SPACE( [PLENGTH | auto ]{1,2} | cover | contain)+ );`
 - [border](http://www.w3.org/TR/CSS21/box.html#propdef-border)
   - TR
@@ -1185,12 +1189,13 @@
       - [CSS Backgrounds 3 - border-width](https://drafts.csswg.org/css-backgrounds-3/#border-width)
   - Values: `INSETS border-top-width border-right-width border-bottom-width border-left-width;`
 - [box-shadow](http://www.w3.org/TR/css3-background/#box-shadow)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Backgrounds 3 - box-shadow](http://www.w3.org/TR/css3-background/#box-shadow)
   - Drafts
       - [CSS Backgrounds 3 - box-shadow](https://drafts.csswg.org/css-backgrounds-3/#box-shadow)
-  - Allowed prefixes: webkit
   - Values: `none | COMMA( SHADOW+ );`
+
 ## [CSS Backgrounds 4](https://drafts.csswg.org/css-backgrounds-4/)
 - [background-position](http://www.w3.org/TR/CSS21/colors.html#propdef-background-position)
   - TR
@@ -1208,6 +1213,7 @@
       - [CSS Backgrounds 3 - border-radius](https://drafts.csswg.org/css-backgrounds-3/#border-radius)
       - [CSS Backgrounds 4 - border-radius](https://drafts.csswg.org/css-backgrounds-4/#propdef-border-radius)
   - Values: `INSETS_SLASH border-top-left-radius border-top-right-radius border-bottom-right-radius border-bottom-left-radius;`
+
 ## [CSS Images 3](http://www.w3.org/TR/css3-images/)
 - [object-fit](http://www.w3.org/TR/css3-images/#object-fit)
   - TR
@@ -1223,6 +1229,7 @@
   - Drafts
       - [CSS Images 3 - object-position](https://drafts.csswg.org/css-images-3/#propdef-object-position)
   - Values: `COMMA( SPACE(BG_POSITION_TERM{1,2})+ ); /* relaxed */`
+
 ## [CSS Images 4](http://www.w3.org/TR/css4-images/)
 - [object-fit](http://www.w3.org/TR/css3-images/#object-fit)
   - TR
@@ -1238,6 +1245,7 @@
   - Drafts
       - [CSS Images 3 - object-position](https://drafts.csswg.org/css-images-3/#propdef-object-position)
   - Values: `COMMA( SPACE(BG_POSITION_TERM{1,2})+ ); /* relaxed */`
+
 ## [CSS Fonts 3](http://www.w3.org/TR/css-fonts-3/)
 - [font](http://www.w3.org/TR/CSS21/fonts.html#propdef-font)
   - TR
@@ -1256,11 +1264,11 @@
       - [CSS Fonts 3 - font-family](https://drafts.csswg.org/css-fonts-3/#propdef-font-family)
   - Values: `FAMILY_LIST;`
 - [font-kerning](http://www.w3.org/TR/css-fonts-3/#propdef-font-kerning)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Fonts 3 - font-kerning](http://www.w3.org/TR/css-fonts-3/#propdef-font-kerning)
   - Drafts
       - [CSS Fonts 3 - font-kerning](https://drafts.csswg.org/css-fonts-3/#propdef-font-kerning)
-  - Allowed prefixes: webkit
   - Values: `auto | normal | none;`
 - [font-size](http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size)
   - TR
@@ -1294,13 +1302,14 @@
       - [CSS 2.1 - font-weight](https://drafts.csswg.org/css2/fonts.html#propdef-font-weight)
       - [CSS Fonts 3 - font-weight](https://drafts.csswg.org/css-fonts-3/#propdef-font-weight)
   - Values: `normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;`
+
 ## [CSS Text 3](http://www.w3.org/TR/css-text-3/)
 - [hyphens](http://www.w3.org/TR/css-text-3/#hyphens)
+    - Allowed prefixes: epub, moz, ms, webkit
   - TR
       - [CSS Text 3 - hyphens](http://www.w3.org/TR/css-text-3/#hyphens)
   - Drafts
       - [CSS Text 3 - hyphens](https://drafts.csswg.org/css-text-3/#propdef-hyphens)
-  - Allowed prefixes: epub, moz, ms, webkit
   - Values: `auto | none;`
 - [letter-spacing](http://www.w3.org/TR/CSS21/text.html#propdef-letter-spacing)
   - TR
@@ -1311,11 +1320,11 @@
       - [CSS Text 3 - letter-spacing](https://drafts.csswg.org/css-text-3/#propdef-letter-spacing)
   - Values: `normal | LENGTH;`
 - [line-break](http://www.w3.org/TR/css-text-3/#line-break0)
+    - Allowed prefixes: ms, webkit
   - TR
       - [CSS Text 3 - line-break](http://www.w3.org/TR/css-text-3/#line-break0)
   - Drafts
       - [CSS Text 3 - line-break](https://drafts.csswg.org/css-text-3/#propdef-line-break)
-  - Allowed prefixes: ms, webkit
   - Values: `auto | loose | normal | strict;`
 - [overflow-wrap](http://www.w3.org/TR/css-text-3/#overflow-wrap)
   - TR
@@ -1324,11 +1333,11 @@
       - [CSS Text 3 - overflow-wrap](https://drafts.csswg.org/css-text-3/#propdef-overflow-wrap)
   - Values: `normal | break-word;`
 - [tab-size](http://www.w3.org/TR/css-text-3/#tab-size)
+    - Allowed prefixes: moz
   - TR
       - [CSS Text 3 - tab-size](http://www.w3.org/TR/css-text-3/#tab-size)
   - Drafts
       - [CSS Text 3 - tab-size](https://drafts.csswg.org/css-text-3/#propdef-tab-size)
-  - Allowed prefixes: moz
   - Values: `NNEG_INT | NNEG_LENGTH;`
 - [text-align](http://www.w3.org/TR/CSS21/text.html#propdef-text-align)
   - TR
@@ -1339,11 +1348,11 @@
       - [CSS Text 3 - text-align](https://drafts.csswg.org/css-text-3/#propdef-text-align)
   - Values: `left | right | center | justify;`
 - [text-align-last](http://www.w3.org/TR/css-text-3/#text-align-last)
+    - Allowed prefixes: moz, ms
   - TR
       - [CSS Text 3 - text-align-last](http://www.w3.org/TR/css-text-3/#text-align-last)
   - Drafts
       - [CSS Text 3 - text-align-last](https://drafts.csswg.org/css-text-3/#propdef-text-align-last)
-  - Allowed prefixes: moz, ms
   - Values: `auto | start | end | left | right | center | justify;`
 - [text-indent](http://www.w3.org/TR/CSS21/text.html#propdef-text-indent)
   - TR
@@ -1354,11 +1363,11 @@
       - [CSS Text 3 - text-indent](https://drafts.csswg.org/css-text-3/#propdef-text-indent)
   - Values: `PLENGTH;`
 - [text-justify](http://www.w3.org/TR/css-text-3/#text-justify)
+    - Allowed prefixes: ms
   - TR
       - [CSS Text 3 - text-justify](http://www.w3.org/TR/css-text-3/#text-justify)
   - Drafts
       - [CSS Text 3 - text-justify](https://drafts.csswg.org/css-text-3/#propdef-text-justify)
-  - Allowed prefixes: ms
   - Values: `auto | none | inter-word | inter-character | inter-ideograph /* specified in UA stylesheet for IE */;`
 - [text-transform](http://www.w3.org/TR/CSS21/text.html#propdef-text-transform)
   - TR
@@ -1378,11 +1387,11 @@
       - [CSS Text 4 - white-space](https://drafts.csswg.org/css-text-4/#propdef-white-space)
   - Values: `normal | pre | nowrap | pre-wrap | pre-line;`
 - [word-break](http://www.w3.org/TR/css-text-3/#word-break)
+    - Allowed prefixes: ms
   - TR
       - [CSS Text 3 - word-break](http://www.w3.org/TR/css-text-3/#word-break)
   - Drafts
       - [CSS Text 3 - word-break](https://drafts.csswg.org/css-text-3/#propdef-word-break)
-  - Allowed prefixes: ms
   - Values: `normal | keep-all | break-all;`
 - [word-spacing](http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing)
   - TR
@@ -1393,12 +1402,13 @@
       - [CSS Text 3 - word-spacing](https://drafts.csswg.org/css-text-3/#propdef-word-spacing)
   - Values: `normal | LENGTH;`
 - [word-wrap](http://www.w3.org/TR/css-text-3/#word-wrap)
+    - Allowed prefixes: ms
   - TR
       - [CSS Text 3 - word-wrap](http://www.w3.org/TR/css-text-3/#word-wrap)
   - Drafts
       - [CSS Text 3 - word-wrap](https://drafts.csswg.org/css-text-3/#propdef-word-wrap)
-  - Allowed prefixes: ms
   - Values: `normal | break-word;`
+
 ## [CSS Text 4](https://drafts.csswg.org/css-text-4/)
 - [white-space](http://www.w3.org/TR/CSS21/text.html#propdef-white-space)
   - TR
@@ -1409,6 +1419,7 @@
       - [CSS Text 3 - white-space](https://drafts.csswg.org/css-text-3/#propdef-white-space)
       - [CSS Text 4 - white-space](https://drafts.csswg.org/css-text-4/#propdef-white-space)
   - Values: `normal | pre | nowrap | pre-wrap | pre-line;`
+
 ## [CSS Text Decoration 3](http://www.w3.org/TR/css-text-decor-3/)
 - [text-decoration](http://www.w3.org/TR/CSS21/text.html#propdef-text-decoration)
   - TR
@@ -1419,61 +1430,61 @@
       - [CSS Text Decoration 3 - text-decoration](https://drafts.csswg.org/css-text-decor-3/#propdef-text-decoration)
   - Values: `none | [ underline || overline || line-through || blink ];`
 - [text-decoration-color](http://www.w3.org/TR/css-text-decor-3/#text-decoration-color)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Text Decoration 3 - text-decoration-color](http://www.w3.org/TR/css-text-decor-3/#text-decoration-color)
   - Drafts
       - [CSS Text Decoration 3 - text-decoration-color](https://drafts.csswg.org/css-text-decor-3/#propdef-text-decoration-color)
-  - Allowed prefixes: webkit
   - Values: `COLOR;`
 - [text-decoration-line](http://www.w3.org/TR/css-text-decor-3/#text-decoration-line)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Text Decoration 3 - text-decoration-line](http://www.w3.org/TR/css-text-decor-3/#text-decoration-line)
   - Drafts
       - [CSS Text Decoration 3 - text-decoration-line](https://drafts.csswg.org/css-text-decor-3/#propdef-text-decoration-line)
-  - Allowed prefixes: webkit
   - Values: `none | [ underline || overline || line-through || blink ];`
 - [text-decoration-skip](http://www.w3.org/TR/css-text-decor-3/#text-decoration-skip)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Text Decoration 3 - text-decoration-skip](http://www.w3.org/TR/css-text-decor-3/#text-decoration-skip)
   - Drafts
       - [CSS Text Decoration 4 - text-decoration-skip](https://drafts.csswg.org/css-text-decor-4/#propdef-text-decoration-skip)
       - [CSS Text Decoration 3 - text-decoration-skip](https://drafts.csswg.org/css-text-decor-3/#propdef-text-decoration-skip)
-  - Allowed prefixes: webkit
   - Values: `none | [ objects || spaces || ink || edges || box-decoration ];`
 - [text-decoration-style](http://www.w3.org/TR/css-text-decor-3/#text-decoration-style)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Text Decoration 3 - text-decoration-style](http://www.w3.org/TR/css-text-decor-3/#text-decoration-style)
   - Drafts
       - [CSS Text Decoration 3 - text-decoration-style](https://drafts.csswg.org/css-text-decor-3/#propdef-text-decoration-style)
-  - Allowed prefixes: webkit
   - Values: `solid | double | dotted | dashed | wavy;`
 - [text-emphasis](http://www.w3.org/TR/css-text-decor-3/#text-emphasis)
+    - Allowed prefixes: epub, webkit
   - TR
       - [CSS Text Decoration 3 - text-emphasis](http://www.w3.org/TR/css-text-decor-3/#text-emphasis)
   - Drafts
       - [CSS Text Decoration 3 - text-emphasis](https://drafts.csswg.org/css-text-decor-3/#propdef-text-emphasis)
-  - Allowed prefixes: epub, webkit
   - Values: `text-emphasis-style text-emphasis-color;`
 - [text-emphasis-color](http://www.w3.org/TR/css-text-decor-3/#text-emphasis-color)
+    - Allowed prefixes: epub, webkit
   - TR
       - [CSS Text Decoration 3 - text-emphasis-color](http://www.w3.org/TR/css-text-decor-3/#text-emphasis-color)
   - Drafts
       - [CSS Text Decoration 3 - text-emphasis-color](https://drafts.csswg.org/css-text-decor-3/#propdef-text-emphasis-color)
-  - Allowed prefixes: epub, webkit
   - Values: `COLOR;`
 - [text-emphasis-position](http://www.w3.org/TR/css-text-decor-3/#text-emphasis-position)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Text Decoration 3 - text-emphasis-position](http://www.w3.org/TR/css-text-decor-3/#text-emphasis-position)
   - Drafts
       - [CSS Text Decoration 3 - text-emphasis-position](https://drafts.csswg.org/css-text-decor-3/#propdef-text-emphasis-position)
-  - Allowed prefixes: webkit
   - Values: `[ over | under ] [ right | left ];`
 - [text-emphasis-style](http://www.w3.org/TR/css-text-decor-3/#text-emphasis-style)
+    - Allowed prefixes: epub, webkit
   - TR
       - [CSS Text Decoration 3 - text-emphasis-style](http://www.w3.org/TR/css-text-decor-3/#text-emphasis-style)
   - Drafts
       - [CSS Text Decoration 3 - text-emphasis-style](https://drafts.csswg.org/css-text-decor-3/#propdef-text-emphasis-style)
-  - Allowed prefixes: epub, webkit
   - Values: `none | [[ filled | open ] || [ dot | circle | double-circle | triangle | sesame ]] | STRING;`
 - [text-shadow](http://www.w3.org/TR/css-text-decor-3/#text-shadow)
   - TR
@@ -1482,12 +1493,13 @@
       - [CSS Text Decoration 3 - text-shadow](https://drafts.csswg.org/css-text-decor-3/#propdef-text-shadow)
   - Values: `none |  COMMA( SHADOW+ );`
 - [text-underline-position](http://www.w3.org/TR/css-text-decor-3/#text-underline-position)
+    - Allowed prefixes: ms, webkit
   - TR
       - [CSS Text Decoration 3 - text-underline-position](http://www.w3.org/TR/css-text-decor-3/#text-underline-position)
   - Drafts
       - [CSS Text Decoration 3 - text-underline-position](https://drafts.csswg.org/css-text-decor-3/#propdef-text-underline-position)
-  - Allowed prefixes: ms, webkit
   - Values: `auto | [ under || [ left | right ]];`
+
 ## [CSS Multicol 1](http://www.w3.org/TR/css3-multicol/)
 - [break-after](http://www.w3.org/TR/css3-multicol/#break-after)
   - TR
@@ -1517,25 +1529,25 @@
       - [CSS Regions 1 - break-inside](https://drafts.csswg.org/css-regions-1/#propdef-break-inside)
   - Values: `auto | avoid | avoid-page | avoid-column | avoid-region;`
 - [column-count](http://www.w3.org/TR/css3-multicol/#column-count)
+    - Allowed prefixes: moz, webkit
   - TR
       - [CSS Multicol 1 - column-count](http://www.w3.org/TR/css3-multicol/#column-count)
   - Drafts
       - [CSS Multicol 1 - column-count](https://drafts.csswg.org/css-multicol-1/#propdef-column-count)
-  - Allowed prefixes: moz, webkit
   - Values: `INT | auto;`
 - [column-fill](http://www.w3.org/TR/css3-multicol/#column-fill)
+    - Allowed prefixes: moz
   - TR
       - [CSS Multicol 1 - column-fill](http://www.w3.org/TR/css3-multicol/#column-fill)
   - Drafts
       - [CSS Multicol 1 - column-fill](https://drafts.csswg.org/css-multicol-1/#propdef-column-fill)
-  - Allowed prefixes: moz
   - Values: `auto | balance;`
 - [column-gap](http://www.w3.org/TR/css3-multicol/#column-gap0)
+    - Allowed prefixes: moz, webkit
   - TR
       - [CSS Multicol 1 - column-gap](http://www.w3.org/TR/css3-multicol/#column-gap0)
   - Drafts
       - [CSS Multicol 1 - column-gap](https://drafts.csswg.org/css-multicol-1/#propdef-column-gap)
-  - Allowed prefixes: moz, webkit
   - Values: `LENGTH | normal;`
 - [column-rule](http://www.w3.org/TR/css3-multicol/#column-rule0)
   - TR
@@ -1544,40 +1556,40 @@
       - [CSS Multicol 1 - column-rule](https://drafts.csswg.org/css-multicol-1/#propdef-column-rule)
   - Values: `column-rule-width column-rule-style column-rule-color;`
 - [column-rule-color](http://www.w3.org/TR/css3-multicol/#column-rule-color)
+    - Allowed prefixes: moz, webkit
   - TR
       - [CSS Multicol 1 - column-rule-color](http://www.w3.org/TR/css3-multicol/#column-rule-color)
   - Drafts
       - [CSS Multicol 1 - column-rule-color](https://drafts.csswg.org/css-multicol-1/#propdef-column-rule-color)
-  - Allowed prefixes: moz, webkit
   - Values: `COLOR;`
 - [column-rule-style](http://www.w3.org/TR/css3-multicol/#column-rule-style)
+    - Allowed prefixes: moz, webkit
   - TR
       - [CSS Multicol 1 - column-rule-style](http://www.w3.org/TR/css3-multicol/#column-rule-style)
   - Drafts
       - [CSS Multicol 1 - column-rule-style](https://drafts.csswg.org/css-multicol-1/#propdef-column-rule-style)
-  - Allowed prefixes: moz, webkit
   - Values: `BORDER_SIDE_STYLE;`
 - [column-rule-width](http://www.w3.org/TR/css3-multicol/#column-rule-width)
+    - Allowed prefixes: moz, webkit
   - TR
       - [CSS Multicol 1 - column-rule-width](http://www.w3.org/TR/css3-multicol/#column-rule-width)
   - Drafts
       - [CSS Multicol 1 - column-rule-width](https://drafts.csswg.org/css-multicol-1/#propdef-column-rule-width)
-  - Allowed prefixes: moz, webkit
   - Values: `BORDER_SIDE_WIDTH;`
 - [column-span](http://www.w3.org/TR/css3-multicol/#column-span0)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Multicol 1 - column-span](http://www.w3.org/TR/css3-multicol/#column-span0)
   - Drafts
       - [CSS Multicol 1 - column-span](https://drafts.csswg.org/css-multicol-1/#propdef-column-span)
       - [CSS Multicol 2 - column-span](https://drafts.csswg.org/css-multicol-2/#propdef-column-span)
-  - Allowed prefixes: webkit
   - Values: `none | all;`
 - [column-width](http://www.w3.org/TR/css3-multicol/#column-width)
+    - Allowed prefixes: moz, webkit
   - TR
       - [CSS Multicol 1 - column-width](http://www.w3.org/TR/css3-multicol/#column-width)
   - Drafts
       - [CSS Multicol 1 - column-width](https://drafts.csswg.org/css-multicol-1/#propdef-column-width)
-  - Allowed prefixes: moz, webkit
   - Values: `LENGTH | auto;`
 - [columns](http://www.w3.org/TR/css3-multicol/#columns0)
   - TR
@@ -1585,15 +1597,17 @@
   - Drafts
       - [CSS Multicol 1 - columns](https://drafts.csswg.org/css-multicol-1/#propdef-columns)
   - Values: `column-width column-count;`
+
 ## [CSS Multicol 2](https://drafts.csswg.org/css-multicol-2/)
 - [column-span](http://www.w3.org/TR/css3-multicol/#column-span0)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Multicol 1 - column-span](http://www.w3.org/TR/css3-multicol/#column-span0)
   - Drafts
       - [CSS Multicol 1 - column-span](https://drafts.csswg.org/css-multicol-1/#propdef-column-span)
       - [CSS Multicol 2 - column-span](https://drafts.csswg.org/css-multicol-2/#propdef-column-span)
-  - Allowed prefixes: webkit
   - Values: `none | all;`
+
 ## [CSS User Interface 3](http://www.w3.org/TR/css3-ui/)
 - [box-sizing](http://www.w3.org/TR/css3-ui/#propdef-box-sizing)
   - TR
@@ -1642,12 +1656,13 @@
       - [CSS User Interface 3 - outline-width](https://drafts.csswg.org/css-ui-3/#propdef-outline-width)
   - Values: `BORDER_SIDE_WIDTH;`
 - [text-overflow](http://www.w3.org/TR/css3-ui/#propdef-text-overflow)
+    - Allowed prefixes: ms
   - TR
       - [CSS User Interface 3 - text-overflow](http://www.w3.org/TR/css3-ui/#propdef-text-overflow)
   - Drafts
       - [CSS User Interface 3 - text-overflow](https://drafts.csswg.org/css-ui-3/#propdef-text-overflow)
-  - Allowed prefixes: ms
   - Values: `[clip | ellipsis | STRING]{1,2};`
+
 ## [CSS Writing Modes 3](http://www.w3.org/TR/css-writing-modes-3/)
 - [direction](http://www.w3.org/TR/CSS21/visuren.html#propdef-direction)
   - TR
@@ -1664,11 +1679,11 @@
       - [CSS Writing Modes 3 - text-combine-upright](https://drafts.csswg.org/css-writing-modes-3/#propdef-text-combine-upright)
   - Values: `none | all | [ digits POS_INT? ]; /* relaxed */`
 - [text-orientation](http://www.w3.org/TR/css-writing-modes-3/#propdef-text-orientation)
+    - Allowed prefixes: epub, webkit
   - TR
       - [CSS Writing Modes 3 - text-orientation](http://www.w3.org/TR/css-writing-modes-3/#propdef-text-orientation)
   - Drafts
       - [CSS Writing Modes 3 - text-orientation](https://drafts.csswg.org/css-writing-modes-3/#propdef-text-orientation)
-  - Allowed prefixes: epub, webkit
   - Values: `mixed | upright | sideways-right | sideways-left | sideways | use-glyph-orientation /* the following values are kept for backward-compatibility */ | vertical-right | rotate-right | rotate-left | rotate-normal | auto;`
 - [unicode-bidi](http://www.w3.org/TR/CSS21/visuren.html#propdef-unicode-bidi)
   - TR
@@ -1679,12 +1694,13 @@
       - [CSS Writing Modes 3 - unicode-bidi](https://drafts.csswg.org/css-writing-modes-3/#propdef-unicode-bidi)
   - Values: `normal | embed | bidi-override;`
 - [writing-mode](http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode)
+    - Allowed prefixes: epub, webkit
   - TR
       - [CSS Writing Modes 3 - writing-mode](http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode)
   - Drafts
       - [CSS Writing Modes 3 - writing-mode](https://drafts.csswg.org/css-writing-modes-3/#propdef-writing-mode)
-  - Allowed prefixes: epub, webkit
   - Values: `horizontal-tb | vertical-rl;`
+
 ## [CSS Speech 1](http://www.w3.org/TR/css3-speech/)
 - [cue-after](http://www.w3.org/TR/CSS21/aural.html#propdef-cue-after)
   - TR
@@ -1734,6 +1750,7 @@
       - [CSS 2.1 - voice-family](https://drafts.csswg.org/css2/aural.html#propdef-voice-family)
       - [CSS Speech 1 - voice-family](https://drafts.csswg.org/css-speech-1/#voice-family)
   - Values: `FAMILY_LIST;`
+
 ## [CSS Flexbox 1](http://www.w3.org/TR/css-flexbox-1/)
 - [align-content](http://www.w3.org/TR/css-flexbox-1/#propdef-align-content)
   - TR
@@ -1807,6 +1824,7 @@
   - Drafts
       - [CSS Flexbox 1 - order](https://drafts.csswg.org/css-flexbox-1/#propdef-order)
   - Values: `INT;`
+
 ## [CSS Lists 3](http://www.w3.org/TR/css3-lists/)
 - [counter-increment](http://www.w3.org/TR/CSS21/generate.html#propdef-counter-increment)
   - TR
@@ -1856,6 +1874,7 @@
       - [CSS 2.1 - list-style-type](https://drafts.csswg.org/css2/generate.html#propdef-list-style-type)
       - [CSS Lists 3 - list-style-type](https://drafts.csswg.org/css-lists-3/#propdef-list-style-type)
   - Values: `LIST_STYLE_TYPE;`
+
 ## [CSS Masking 1](http://www.w3.org/TR/css-masking-1/)
 - [clip](http://www.w3.org/TR/CSS21/visufx.html#propdef-clip)
   - TR
@@ -1865,6 +1884,7 @@
       - [CSS 2.1 - clip](https://drafts.csswg.org/css2/visufx.html#propdef-clip)
       - [CSS Masking 1 - clip](https://drafts.fxtf.org/css-masking-1/#propdef-clip)
   - Values: `rect(ALENGTH{4}) | rect(SPACE(ALENGTH{4})) | auto;`
+
 ## [CSS Positioned Layout 3](http://www.w3.org/TR/css3-positioning/)
 - [bottom](http://www.w3.org/TR/CSS21/visuren.html#propdef-bottom)
   - TR
@@ -1914,13 +1934,14 @@
       - [CSS 2.1 - z-index](https://drafts.csswg.org/css2/visuren.html#propdef-z-index)
       - [CSS Positioned Layout 3 - z-index](https://drafts.csswg.org/css-position-3/#propdef-z-index)
   - Values: `auto | INT;`
+
 ## [CSS Fragmentation 3](http://www.w3.org/TR/css3-break/)
 - [box-decoration-break](http://www.w3.org/TR/css3-break/#box-decoration-break)
+    - Allowed prefixes: webkit
   - TR
       - [CSS Fragmentation 3 - box-decoration-break](http://www.w3.org/TR/css3-break/#box-decoration-break)
   - Drafts
       - [CSS Fragmentation 3 - box-decoration-break](https://drafts.csswg.org/css-break-3/#propdef-box-decoration-break)
-  - Allowed prefixes: webkit
   - Values: `slice | clone;`
 - [break-after](http://www.w3.org/TR/css3-multicol/#break-after)
   - TR
@@ -1965,28 +1986,30 @@
       - [CSS 2.1 - widows](https://drafts.csswg.org/css2/page.html#propdef-widows)
       - [CSS Fragmentation 3 - widows](https://drafts.csswg.org/css-break-3/#propdef-widows)
   - Values: `POS_INT;`
+
 ## [CSS Transforms 1](http://www.w3.org/TR/css-transforms-1/)
 - [backface-visibility](http://www.w3.org/TR/css-transforms-1/#propdef-backface-visibility)
+    - Allowed prefixes: ms, webkit
   - TR
       - [CSS Transforms 1 - backface-visibility](http://www.w3.org/TR/css-transforms-1/#propdef-backface-visibility)
   - Drafts
       - [CSS Transforms 1 - backface-visibility](https://drafts.csswg.org/css-transforms-1/#propdef-backface-visibility)
-  - Allowed prefixes: ms, webkit
   - Values: `visible | hidden;`
 - [transform](http://www.w3.org/TR/css-transforms-1/#propdef-transform)
+    - Allowed prefixes: epub, ms
   - TR
       - [CSS Transforms 1 - transform](http://www.w3.org/TR/css-transforms-1/#propdef-transform)
   - Drafts
       - [CSS Transforms 1 - transform](https://drafts.csswg.org/css-transforms-1/#propdef-transform)
-  - Allowed prefixes: epub, ms
   - Values: `none | TRANSFORM_FUNCTION+;`
 - [transform-origin](http://www.w3.org/TR/css-transforms-1/#propdef-transform-origin)
+    - Allowed prefixes: epub, ms
   - TR
       - [CSS Transforms 1 - transform-origin](http://www.w3.org/TR/css-transforms-1/#propdef-transform-origin)
   - Drafts
       - [CSS Transforms 1 - transform-origin](https://drafts.csswg.org/css-transforms-1/#propdef-transform-origin)
-  - Allowed prefixes: epub, ms
   - Values: `[[[ top | bottom | left | right] PLENGTH?] | center | PLENGTH]{1,2}; /* relaxed */`
+
 ## [CSS Ruby 1](http://www.w3.org/TR/css-ruby-1/)
 - [display](http://www.w3.org/TR/CSS21/visuren.html#propdef-display)
   - TR
@@ -2009,6 +2032,7 @@
   - Drafts
       - [CSS Ruby 1 - ruby-position](https://drafts.csswg.org/css-ruby-1/#propdef-ruby-position)
   - Values: `over | under | inter-character;`
+
 ## [CSS Overflow 3](http://www.w3.org/TR/css-overflow-3/)
 - [overflow](http://www.w3.org/TR/CSS21/visufx.html#propdef-overflow)
   - TR
@@ -2018,21 +2042,24 @@
       - [CSS 2.1 - overflow](https://drafts.csswg.org/css2/visufx.html#propdef-overflow)
       - [CSS Overflow 3 - overflow](https://drafts.csswg.org/css-overflow-3/#propdef-overflow)
   - Values: `visible | hidden | scroll | auto;`
+
 ## [CSS Shapes 1](http://www.w3.org/TR/css-shapes-1/)
 - [shape-outside](http://www.w3.org/TR/css-shapes-1/#propdef-shape-outside)
+    - Allowed prefixes: epubx, webkit
   - TR
       - [CSS Shapes 1 - shape-outside](http://www.w3.org/TR/css-shapes-1/#propdef-shape-outside)
   - Drafts
       - [CSS Shapes 1 - shape-outside](https://drafts.csswg.org/css-shapes-1/#propdef-shape-outside)
-  - Allowed prefixes: epubx, webkit
   - Values: `SHAPE;`
+
 ## [CSS Shapes 2](https://drafts.csswg.org/css-shapes-2/)
 - [shape-inside](#propdef-shape-inside)
+    - Allowed prefixes: epubx
 
   - Drafts
       - [CSS Shapes 2 - shape-inside](https://drafts.csswg.org/css-shapes-2/#propdef-shape-inside)
-  - Allowed prefixes: epubx
   - Values: `SHAPE;`
+
 ## [CSS Regions 1](http://www.w3.org/TR/css3-regions/)
 - [break-after](http://www.w3.org/TR/css3-multicol/#break-after)
   - TR
@@ -2062,34 +2089,37 @@
       - [CSS Regions 1 - break-inside](https://drafts.csswg.org/css-regions-1/#propdef-break-inside)
   - Values: `auto | avoid | avoid-page | avoid-column | avoid-region;`
 - [flow-from](http://www.w3.org/TR/css3-regions/#propdef-flow-from)
+    - Allowed prefixes: epubx, webkit
   - TR
       - [CSS Regions 1 - flow-from](http://www.w3.org/TR/css3-regions/#propdef-flow-from)
   - Drafts
       - [CSS Regions 1 - flow-from](https://drafts.csswg.org/css-regions-1/#propdef-flow-from)
-  - Allowed prefixes: epubx, webkit
   - Values: `IDENT;`
 - [flow-into](http://www.w3.org/TR/css3-regions/#propdef-flow-into)
+    - Allowed prefixes: epubx, webkit
   - TR
       - [CSS Regions 1 - flow-into](http://www.w3.org/TR/css3-regions/#propdef-flow-into)
   - Drafts
       - [CSS Regions 1 - flow-into](https://drafts.csswg.org/css-regions-1/#propdef-flow-into)
-  - Allowed prefixes: epubx, webkit
   - Values: `IDENT;`
+
 ## [CSS Exclusions 1](http://www.w3.org/TR/css3-exclusions/)
 - [wrap-flow](http://www.w3.org/TR/css3-exclusions/#propdef-wrap-flow)
+    - Allowed prefixes: epubx, ms
   - TR
       - [CSS Exclusions 1 - wrap-flow](http://www.w3.org/TR/css3-exclusions/#propdef-wrap-flow)
   - Drafts
       - [CSS Exclusions 1 - wrap-flow](https://drafts.csswg.org/css-exclusions-1/#propdef-wrap-flow)
-  - Allowed prefixes: epubx, ms
   - Values: `auto | both | start | end | maximum | clear | around /* epub al */;`
+
 ## [CSS Size Adjustment 1](https://drafts.csswg.org/css-size-adjust-1/)
 - [text-size-adjust](#text-size-adjust)
+    - Allowed prefixes: moz, ms
 
   - Drafts
       - [CSS Size Adjustment 1 - text-size-adjust](https://drafts.csswg.org/css-size-adjust-1/#text-size-adjust)
-  - Allowed prefixes: moz, ms
   - Values: `auto | none | POS_PERCENTAGE;`
+
 ## [CSS Inline Layout 3](http://www.w3.org/TR/css-inline-3/)
 - [vertical-align](http://www.w3.org/TR/CSS21/visudet.html#propdef-vertical-align)
   - TR
@@ -2099,6 +2129,7 @@
       - [CSS 2.1 - vertical-align](https://drafts.csswg.org/css2/visudet.html#propdef-vertical-align)
       - [CSS Inline Layout 3 - vertical-align](https://drafts.csswg.org/css-inline-3/#propdef-vertical-align)
   - Values: `baseline | sub | super | top | text-top | middle | bottom | text-bottom | PLENGTH;`
+
 ## [CSS Page Floats 3](https://drafts.csswg.org/css-page-floats-3/)
 - [clear](http://www.w3.org/TR/CSS21/visuren.html#propdef-clear)
   - TR
@@ -2119,207 +2150,209 @@
   - Drafts
       - [CSS Page Floats 3 - float-reference](https://drafts.csswg.org/css-page-floats-3/#propdef-float-reference)
   - Values: `inline | column | region | page;`
+
 ## [Uncategorized]()
 - [after]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `APLENGTH;`
 - [before]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `APLENGTH;`
 - [behavior]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `IDENT;`
 - [border-after-color]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_COLOR;`
 - [border-after-style]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_STYLE;`
 - [border-after-width]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_WIDTH;`
 - [border-before-color]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_COLOR;`
 - [border-before-style]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_STYLE;`
 - [border-before-width]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_WIDTH;`
 - [border-end-color]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_COLOR;`
 - [border-end-style]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_STYLE;`
 - [border-end-width]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_WIDTH;`
 - [border-start-color]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_COLOR;`
 - [border-start-style]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_STYLE;`
 - [border-start-width]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `BORDER_SIDE_WIDTH;`
 - [conflicting-partitions]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `COMMA(IDENT+);`
 - [enabled]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `true | false;`
 - [end]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `APLENGTH;`
 - [flow-consume]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `all | some;`
 - [flow-linger]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `INT | none;`
 - [flow-options]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `none | [ exclusive || last || static ];`
 - [flow-priority]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `INT;`
 - [margin-after]()
+    - Allowed prefixes: adapt, webkit
 
 
-  - Allowed prefixes: adapt, webkit
   - Values: `APLENGTH;`
 - [margin-before]()
+    - Allowed prefixes: adapt, webkit
 
 
-  - Allowed prefixes: adapt, webkit
   - Values: `APLENGTH;`
 - [margin-end]()
+    - Allowed prefixes: adapt, webkit
 
 
-  - Allowed prefixes: adapt, webkit
   - Values: `APLENGTH;`
 - [margin-start]()
+    - Allowed prefixes: adapt, webkit
 
 
-  - Allowed prefixes: adapt, webkit
   - Values: `APLENGTH;`
 - [min-page-height]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `LENGTH;`
 - [min-page-width]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `LENGTH;`
 - [oeb-column-number]()
 
 
   - Values: `column-count;`
 - [required]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `true | false;`
 - [required-partitions]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `COMMA(IDENT+);`
 - [snap-height]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `LENGTH | none;`
 - [snap-width]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `LENGTH | none;`
 - [src]()
 
 
   - Values: `COMMA([SPACE(URI format(STRING+)?) | local(FAMILY)]+); /* for font-face */`
 - [start]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `APLENGTH;`
 - [template]()
+    - Allowed prefixes: adapt
 
 
-  - Allowed prefixes: adapt
   - Values: `URI_OR_NONE;`
 - [text-combine]()
+    - Allowed prefixes: webkit
 
 
-  - Allowed prefixes: webkit
   - Values: `none | horizontal;`
 - [text-combine-horizontal]()
+    - Allowed prefixes: epub, ms
 
 
-  - Allowed prefixes: epub, ms
   - Values: `none | all | [ digits POS_INT? ]; /* relaxed */`
 - [text-zoom]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `font-size | scale;`
 - [touch-action]()
+    - Allowed prefixes: ms
 
 
-  - Allowed prefixes: ms
   - Values: `auto | none | [ pan-x || pan-y ] | manipulation;`
 - [utilization]()
+    - Allowed prefixes: epubx
 
 
-  - Allowed prefixes: epubx
   - Values: `NUM;`
+
diff --git a/doc/property-doc-template.mustache b/doc/property-doc-template.mustache
index 9da913663..ec300575b 100644
--- a/doc/property-doc-template.mustache
+++ b/doc/property-doc-template.mustache
@@ -4,6 +4,9 @@
 {{/spec}}
 {{#properties}}
 - [{{{name}}}]({{#spec}}{{{spec.base_uri}}}{{{uri}}}{{/spec}})
+{{#prefixes}}
+    - Allowed prefixes: {{{prefixes}}}
+{{/prefixes}}
 {{#trData.length}}  - TR{{/trData.length}}
 {{#trData}}
       - [{{{spec.title}}} - {{{title}}}]({{{spec.base_uri}}}{{{uri}}})
@@ -12,9 +15,7 @@
 {{#draftData}}
       - [{{{spec.title}}} - {{{title}}}]({{{spec.draft_uri}}}{{{uri}}})
 {{/draftData}}
-{{#prefixes}}
-  - Allowed prefixes: {{{prefixes}}}
-{{/prefixes}}
   - Values: `{{{value}}}`
 {{/properties}}
+
 {{/properties}}