diff --git a/README.md b/README.md
index 7dfbc3a..d7de893 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,122 @@
 # 8fold HTML Builder for PHP
 
-HTML Builder extends and is a web-specific implementation of
-[8fold XML Builder](https://github.com/8fold/php-xml-builder); similar to how
-HTML extends and is a specific implementation of XML.
+HTML Builder is a web-specific string compiler.
+
+Warning: Users of this library are responsible for sanitizing content.
+
+- [Installation](#installation)
+- [Usage](#usage)
+  - [`Element⁣`](#element)
+  - [`EmptyElement`](#emptyelement)
+  - [`Document`](#document)
+  - [`Comment`](#comment)
+  - [Properties](#properties)⁣
+- [Extending](#extending)⁣
+- [Performance](#performance)⁣
+- Migrating (`docs/`)
+  - [5.0 to 5.1](./docs/migrating-from-050000-050100.md)
+  - [4.x to 5.0](#migrating-from-4x-to-50)⁣
+- [Details](#details)
+- [Other](#other)⁣
 
 ## Installation
 
 `composer require 8fold/php-html-builder`
 
-## Usage (basic)
+## Usage
 
-Warning: Users of this library are responsible for sanitizing content.
+HTML Builder quickly outputs HTML strings with consistent
+ordering of attributes for elements.
+
+The default order is in the [`Element`](https://github.com/8fold/php-html-builder/blob/main/src/Element.php)
+class. If you prefer a different ordering, you can extend and override the ‘Element’ class and ordering constant.
+
+### `Element`
+
+The fundamental building block for all output.
+
+```php
+use Eightfold\HtmlBuilder\Element;
+
+// non-empty element, using `create()`
+Element::create('p', 'Hello, World!')->props('id intro');
+```
 
-By default, HTML Builder can quickly output an HTML string with consistent
-ordering of attributes for elements. The default order can be found in the
-[`Element`](https://github.com/8fold/php-html-builder/blob/main/src/Element.php)
-class, which can be overridden, if you prefer a different ordering. This helps
-create and maintain a consistent HTML pattern. Further, this pattern can be
-changed without updating templates or other code.
+Output:
+```html
+<p id="intro">Hello, World!</p>
+```
+
+Non-empty element using magic method:
+```php
+Element::p('Hello, World!')->props('id intro');
+```
 
+Output:
+```html
+<p id="intro">Hello, World!</p>
+```
+
+Empty element using magic method:
 ```php
-use Eightfold\HTMLBuilder\Document;
-use Eightfold\HTMLBuilder\Element;
+Element::img()->omitEndTag()->props('src /path/to/image.png');
+```
+
+Output:
+```html
+<img src="/path/to/image.php">
+```
+
+### `EmptyElement`
+
+The [`EmptyElement`](https://github.com/8fold/php-html-builder/blob/main/src/EmptyElement.php) class was introduced in the 5.1 release and is designed to mirror the input shorthand of HTML those elements compared to using the `Element` class to do the same.
+
+```php
+use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
+
+// empty element use Element
+Element::img()->omitEndTag()->props('src /path/to/image.png');
+```
+
+Output:
+```html
+<img src="/path/to/image.php">
+```
+
+Using `EmptyElement`:
+```php
+EmptyElement::img('src /path/to/image.png');
+
+// output same as previous
+```
+
+### `Document`
+
+The [`Document`](https://github.com/8fold/php-html-builder/blob/main/src/Document.php) class gives you to generate a complete HTML document entirely in PHP.
+
+```php
+use Eightfold\HtmlBuilder\Document;
+use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
 
 Document::create('title')
   ->head(
-    Element::link()
-      ->omitEndTag()->props('rel stylesheet', 'href style.css'),
+    EmptyElement::link('rel stylesheet', 'href style.css'),
     Element::script()->props('src script.js')
   )->body(
-    Element::p('paragraph content')
-  )
+    Element::p('Hello, World!')
+  );
 ```
 
 Output:
 
 ```html
+<!-- compressed -->
 <!doctype html>
-<html lang="en"><head><title>title</title><meta charset="utf-8"><link rel="stylesheet" href="style.css"><script src="script.js"></script></head><body><p>paragraph content</p></body></html>
-```
-
-Output (formatted):
+<html lang="en"><head><title>title</title><meta charset="utf-8"><link rel="stylesheet" href="style.css"><script src="script.js"></script></head><body><p>Hello, World!</p></body></html>
 
-```html
+<!-- human-readable -->
 <!doctype html>
 <html lang="en">
   <head>
@@ -57,253 +131,91 @@ Output (formatted):
 </html>
 ```
 
-Further examples can be found in the
-[`tests`](https://github.com/8fold/php-html-builder/tree/main/tests) folder with
-an example extension.
+Further examples are in the [`tests`](https://github.com/8fold/php-html-builder/tree/main/tests) folder with an example extension.
 
-A note on properties: If a property is not in the ordered list, and the value of
-the property is the same as the name of the property, HTML Builder will presume
-it's a boolean value and will truncate the definition in the HTML output.
+### `Comment`
+
+There’s even a [`Comment`](https://github.com/8fold/php-html-builder/blob/main/src/Comment.php) component for adding inline HTML comments.
 
 ```php
-Element::input()->omitEndTag()->props("required required");
-```
+use Eightfold\HtmlBuilder\Document;
+use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
+use Eightfold\HtmlBuilder\Comment;
 
-Output:
+Document::create('title')
+  ->head(
+    EmptyElement::link('rel stylesheet', 'href style.css'),
+    Element::script()->props('src script.js')
+  )->body(
+    Comment::create('comment-based-injection-point'),
+    Element::p('Hello, World!')
+  );
+```
 
+Output (human-readable):
 ```html
-<input required>
+<!doctype html>
+<html lang="en">
+  <head>
+    <title>title</title>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="style.css">
+    <script src="script.js"></script>
+  </head>
+  <body>
+    <!-- comment-based-injection-point -->
+    <p>paragraph content</p>
+  </body>
+</html>
 ```
 
-## Migrating from 4.x to 5.0
-
-This section highlights the changes to check when upgrading from 4.4.0. It
-links to the [form control guidance](#form-control-guidance) for details that
-apply to the new and existing APIs.
-
-### Required migration checks: markup and property targets
-
-Text-entry controls now render an outer `<div>` unconditionally. In 4.4.0,
-`TextInput`, `EmailInput`, and `Password` rendered their label and input as siblings without
-that container. Update CSS child/sibling selectors, flex or grid layouts, and
-JavaScript traversal that assumed the old structure.
-
-```html
-<!-- 4.4.0 -->
-<label for="email">Email</label><input id="email" name="email" type="text">
+### Properties
 
-<!-- 5.0 -->
-<div class="field">
-  <label for="email">Email</label><input id="email" name="email" type="text">
-</div>
-```
+`Element` arranges all properties that are not in the ordered list alphabetically after the ordered properties.
 
-Use each property method for its element: `containerProps()` targets the outer
-container, `labelProps()` targets the label (or a Select group's legend), and
-`inputProps()` targets the input, textarea, or select. Fieldset's `labelProps()`
-targets its legend. For example:
+Properties with same name and value are presumed to be boolean properties (`required`), and will placed at the end of the element.
 
 ```php
-use Eightfold\HtmlBuilder\Forms\TextInput;
+use Eightfold\HtmlBuilder\EmptyElement;
 
-TextInput::create('Email', 'email')
-    ->containerProps('class field')
-    ->labelProps('class field-label')
-    ->inputProps('class form-control');
+EmptyElement::input('required required');
 ```
 
-Do not use `inputProps()` or `labelProps()` to replace generated properties
-such as `type`, `id`, `name`, `value`, or the label's `for` association. For
-example, 4.4.0 allowed `TextInput::create('Email', 'email')->inputProps('type email')`
-to change its generated type; in 5.0, use `EmailInput` instead. Use constructor
-arguments, `id()`, or the component/mode that matches the control you need.
-Setting a custom ID changes the DOM ID and its generated label and warning
-associations, but does not change the submitted field name:
-
-```php
-TextInput::create('Email', 'account_email')->id('email-field');
-// The input has id="email-field" and name="account_email".
+Output:
+```html
+<input required>
 ```
 
-### Choose Select modes and names explicitly
-
-The default remains a single dropdown. `multiple()`, `radio()`, and
-`checkbox()` explicitly choose the other modes. The initial selection is
-single-valued for dropdowns and radio groups (only the first supplied value is
-considered), and every matching value is selected for multiple dropdowns and
-checkbox groups.
-
-Dropdowns, including multiple dropdowns, and radio groups submit the supplied
-name unchanged. Include `[]` yourself when a multiple dropdown should submit a
-PHP array. Checkbox groups continue to append `[]` unless the supplied name
-already ends with it. `checked` and `multiple` passed through `inputProps()` are
-ignored; use the selection argument and mode methods instead. See
-[Select attributes and selection](#select-attributes-and-selection) for native
-attribute targets and examples.
-
-Radio and checkbox member IDs now use `<control-id>-option-<zero-based-index>`
-instead of `<name>-<option-value>`. For example, option `a` in a group named
-`categories` changes from `categories-a` to `categories-option-0`. Generated
-labels follow the new IDs automatically; update external labels, CSS selectors,
-and JavaScript that reference the old IDs. `id()` changes the group's member-ID
-prefix, not its submitted name.
-
-### Update custom PropertyInterface implementations
-
-`PropertyInterface` now extends PHP's `Stringable`. Any custom implementation
-must add `public function __toString(): string` alongside `prop()` and
-`props()`.
-
-### Additive APIs and deprecated, still-working calls
-
-`containerProps()` is available for form controls, and `id()` is available on
-TextInput, EmailInput, Password, TextArea, and Select. Select also adds
-`multiple()` and `inputProps()`. These APIs are additive.
-
-`wrapperProps()` remains callable as a forwarding alias throughout 5.x. It
-continues to set the same container properties, but is deprecated in favor of
-`containerProps()` and emits `E_USER_DEPRECATED`. The native `#[Deprecated]`
-attribute is supported by PHP 8.4 and later; removal is deferred until at
-least 6.0. See [Migrating from wrapperProps](#migrating-from-wrapperprops).
-
-Escaping remains caller-owned; this upgrade does not introduce automatic
-escaping. `TextArea` is a new control, and its caller-supplied, already-escaped
-value is rendered as text content. Its leading-newline and newline-normalizing
-behavior is described in [Textarea values](#textarea-values).
-
-## Form control guidance
-
-`TextInput`, `EmailInput`, `Password`, `TextArea`, and all `Select` modes preserve help IDs
-supplied through `inputProps('aria-describedby help-id')` when adding a warning.
-With a warning, the control sets `aria-invalid="true"` and appends
-`<control-id>-warning` to `aria-describedby`, removing duplicate references while
-preserving their order. Use `content()` to supply the referenced help elements.
-Overriding the control's `id()` also changes its generated warning ID.
-
-`tests/ControlGuidanceTest.php` checks these relationships across control types.
-Assertion failures identify the relationship, control type and ID, and rendered
-HTML, alongside PHPUnit's named case and expected/actual diff.
-
-### Text and email input values
-
-`TextInput` and `EmailInput` use the constructor's initial value, including an
-empty string. Caller-supplied `value` properties in `inputProps()` are ignored;
-an empty constructor value omits the attribute rather than retaining stale
-caller content. Unrelated native input properties are preserved. Values remain
-caller-sanitized: the components do not escape or encode them.
-
-Text-entry controls and dropdown selects keep each label's generated `for`
-association in sync with the control's `id()`, overriding conflicting
-`labelProps('for other')` properties while preserving unrelated label properties.
-For radio and checkbox groups, `labelProps()` targets the legend instead.
-
-### Textarea values
-
-`TextArea::create($label, $name, $value = '', $warningMessage = '')` accepts
-**caller-sanitized content** for `$value`, consistent with the other controls.
-It renders the supplied value without escaping, decoding, or double encoding.
-The implementer must escape untrusted text before passing it to the component;
-an unescaped `</textarea>` can close the control and introduce markup.
-Escaping flags, character encoding, and invalid-character handling remain the
-implementer's choice.
+Properties me be added individually to facilitate dynamic construction.
 
 ```php
-use Eightfold\HtmlBuilder\Forms\TextArea;
-
-$value = "\nFirst line & second line\n";
-$escapedValue = htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-
-TextArea::create('Notes', 'notes', $escapedValue, 'Add more detail.')
-    ->inputProps('rows 4', 'required required')
-    ->labelProps('class notes-label');
+use Eightfold\HtmlBuild\Element;
+
+$callout = Element::div('Information in the callout.')
+    ->props('class callout', 'aria-role alert');
+    
+if ($isWarning) {
+    $callout = $callout->prop('is warning');
+}
 ```
 
-Values are element text, not a `value` attribute. Spaces, tabs, and leading,
-internal, and trailing LF newlines are preserved: rendering adds one extra
-leading newline that HTML consumes. Native HTML parsing normalizes CR and CRLF
-line endings to LF; browsers apply their native textarea submission rules.
-`inputProps()` targets the textarea and supports native `rows`, `required`,
-`readonly`, and `disabled` attributes. Generated `id` and `name` override
-conflicting input properties; `id()` also updates the label and warning
-associations. String and `PropertyInterface` warnings follow the shared guidance
-rules above.
-
-The escaping call above is an application example, not a component default.
-To display literal entity syntax such as `&amp;`, escape that text too (for
-example, supply `&amp;amp;`). Callers remain responsible for sanitizing all
-values, labels, warning markup, additional content, and attribute values.
-
-### Select attributes and selection
-
-`Select::inputProps()` targets the `<select>` in dropdown modes and **every**
-member `<input>` in radio/checkbox modes. Use native attributes appropriate to
-those elements: for example, `required`, `disabled`, and help references on
-either, and `size` on a dropdown. Selects, radios, and checkboxes do not support
-`readonly`; the component does not emulate it.
-
-```php
-use Eightfold\HtmlBuilder\Element;
-use Eightfold\HtmlBuilder\Forms\Select;
-
-Select::create('Category', 'category', ['a' => 'A', 'b' => 'B'], 'b')
-    ->inputProps('required required', 'disabled disabled');
+Output
+```html
+<!-- human-readable: `$isWarning = false` -->
+<div class="callout" aria-role="alert">
+    Information in the callout.
+</div>
 
-Select::create('Categories', 'categories[]', ['a' => 'A', 'b' => 'B'], ['a', 'b'])
-    ->multiple()
-    ->inputProps('size 4', 'aria-describedby categories-help')
-    ->content(Element::p('Choose one or more.')->props('id categories-help'));
+<!-- human-readable: $isWarning = true -->
+<div is="warning" class="callout" aria-role="alert">
+    Information in the callout.
+</div>
 ```
 
-The default mode is a single dropdown. `dropdown()` and `radio()` consider only
-the first supplied selection; `multiple()` and `checkbox()` select every matching
-option. Unmatched values select nothing in the generated markup (a native
-single dropdown may still display its first option by default). Option matching
-uses strings, including for numeric option keys.
-
-Dropdowns (including multiple dropdowns) and radio groups preserve the supplied
-field name exactly. For PHP array submissions, supply a name such as
-`categories[]` yourself. Checkbox groups retain the existing convention of
-appending `[]` unless the name already ends with it.
-
-`containerProps()` targets the dropdown's `<div>` or the group's `<fieldset>`.
-For native group-wide disabling, use
-`->checkbox()->containerProps('disabled disabled')` (or `radio()`); the browser
-disables descendants through fieldset semantics, without rewriting the inputs.
-Disabling a dropdown instead requires `inputProps('disabled disabled')`.
-`labelProps()` targets the dropdown's label or the group's legend.
-
-`inputProps('required required')` on a radio group uses native radio-group
-validation. On a checkbox group it makes **every checkbox required**, not
-"at least one checkbox"; the component provides no generic group-required rule.
-
-Generated control IDs and submitted names take precedence over `inputProps()`;
-group input types and option values are also generated. `checked` and `multiple`
-properties supplied through `inputProps()` are ignored: use the `selected`
-argument and explicit mode methods instead. A warning forces
-`aria-invalid="true"` and merges help references as described above. Without a
-warning, caller-supplied guidance and invalid-state properties remain unchanged.
-Other repeated properties use the element builder's normal last-value behavior.
-
-### Fieldset warnings
-
-`Fieldset::create($label, $name, $warningMessage = '')` renders one group warning
-with the ID `<name>-warning`. String warnings are wrapped in a paragraph and
-retain caller-supplied markup. `PropertyInterface` warnings retain their element,
-content, and other properties; the generated ID is applied to a local clone,
-leaving the caller's warning object unchanged. Repeated rendering is stable, and
-the same warning object can be reused across components with independent IDs.
-
-Fieldset does not inspect or rewrite arbitrary children passed to `elements()`.
-Callers remain responsible for setting `aria-invalid` and `aria-describedby` on
-member controls, including references to the group warning when appropriate.
-
-### Migrating from wrapperProps
-
-In 5.0, use `containerProps()` instead of `wrapperProps()` on all form
-components. This is a rename, not a change in property handling or target
-elements. `wrapperProps()` remains a forwarding alias throughout 5.x and is
-marked with PHP's native `#[Deprecated]` attribute (supported since PHP 8.4).
-Calling it emits `E_USER_DEPRECATED`; removal is deferred until at least 6.0.
+## Extending
+
+Each HTML Builder component accepts string literals and classes that implement the PHP-native `Stringable` interface. Further, HTML Build provides the [`PropertyInterface`](https://github.com/8fold/php-html-builder/blob/main/src/PropertyInterface.php), which extends the `Stringable` interface. Therefore, HTML Builder allows developers to create custom components and APIs without extending HTML Builder’s base components.
 
 ## Performance
 
@@ -344,8 +256,7 @@ Things worth noting (as rough interpretations):
 
 ## Details
 
-See [8fold XML Builder](https://github.com/8fold/php-xml-builder#readme) for more
-details.
+See [8fold XML Builder](https://github.com/8fold/php-xml-builder#readme) for PHP HTML Builder’s sibling.
 
 ## Other
 
diff --git a/docs/migrating-from-04x-050000.md b/docs/migrating-from-04x-050000.md
new file mode 100644
index 0000000..684aec6
--- /dev/null
+++ b/docs/migrating-from-04x-050000.md
@@ -0,0 +1,201 @@
+# Migrating from 4.x to 5.0
+
+- New
+    - [`TextArea`](#textarea) form control
+    - [`Select`](#select) adds `multiple()` mode and `inputProps()` methods; `SelectType` enum updated accordingly
+    - [Form controls preserve help IDs](#form-controls-preserve-help-ids) when warning is present
+    - [Text controls](#text-controls-containing-div) add a containing `div` element
+    - [All form controls have](#normalized-form-control-property-methods) `containerProps()`, `labelProps()`, and `inputProps()`; `FieldSet::labelProps()` targets the `legend` element
+    - `id()` is available on `TextInput`, `EmailInput`, `Password`, `TextArea`, and `Select`; allowing you to override the default `id` based on `name`
+
+- Updated or fixed:
+    - [`PropertyInterface`](https://github.com/8fold/php-html-builder/blob/main/src/PropertyInterface.php) extends PHP's `Stringable`; add `public function __toString(): string` alongside `prop()` and `props()`.
+    - `Select` [`radio()` and `checkbox()` IDs](#radio-and-checkbox-ids) use `<control-id>-option-<zero-based-index>` instead of `<name>-<option-value>`
+    - `warningMessage` accessibility improved for each form control; `Fieldset` renders one warning for the group and [does not inspect child elements](#fieldset-does-not-inspect-children)
+- Deprecated:
+    - [`wrapperProps()` on form controls](#wrapper-on-form-controls)
+- Deleted: None
+
+## New
+
+### `TextArea`
+
+Escaping content remains caller-owned.
+
+`TextArea` is a new form control, and its value is rendered as text content. It renders the supplied value without escaping, decoding, or double encoding.
+
+```php
+use Eightfold\HtmlBuilder\Forms\TextArea;
+
+TextArea::create(
+    $label,
+    $name,
+    $value = '', // caller-sanitized content, not a value attribute in <textarea>
+    $warningMessage = ''
+);
+
+// Example of preparing a value; not a component capability.
+// To display literal entity syntax such as `&amp;`, escape that text too
+// (for example, supply `&amp;amp;`).
+$value = "\nFirst line & second line\n";
+$escapedValue = htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+
+TextArea::create('Notes', 'notes', $escapedValue, 'Add more detail.')
+    ->inputProps('rows 4', 'required required')
+    ->labelProps('class notes-label');
+```
+
+Values are element text, not a `value` attribute. Spaces, tabs, and leading, internal, and trailing LF newlines are preserved: rendering adds one extra leading newline that HTML consumes.
+
+Native HTML parsing normalizes CR and CRLF line endings to LF; browsers apply their native textarea submission rules.
+
+- `inputProps()` targets the textarea and supports native `rows`, `required`, `readonly`, and `disabled` attributes.
+- Generated `id` and `name` override conflicting input properties; `id()` also updates the label and warning associations.
+
+### Select
+
+`Select` defaults to a single dropdown.
+
+```php
+<select name="sample">
+    <option value="1">1</option>
+    <option value="2">2</option>
+</select>
+```
+
+Choose different select controls by calling the method representing the desired type:
+
+- `radio()` for single select, with exposed list;
+- `checkbox()` for multiple select, with exposed list, which will append `[]` to the name if the supplied name doesn’t include it; and
+- `multiple()` for multiple select box, requires keyboard interaction and including `[]` with the name (recommend checkbox instead).
+
+`checked` and `multiple` passed to `inputProps()` are ignored; use the selection argument and mode methods instead.
+
+```php
+Select::create(
+    'Label text',
+    'name',
+    ['a' => 'A', 'b' => 'B', 'c' => 'C'],
+    ['a', 'c'] // selected, checked
+)->checkbox();
+```
+
+See [`Select` attributes and selection](#select-attributes-and-selection) for native attribute targets and examples.
+
+### Form controls preserve help IDs
+
+`TextInput`, `EmailInput`, `Password`, `TextArea`, and all `Select` modes preserve help IDs supplied through `inputProps('aria-describedby help-id')` when adding a warning.
+
+With a warning, the control sets `aria-invalid="true"` and appends `<control-id>-warning` to `aria-describedby`, removing duplicate references while preserving their order.
+
+Use `content()` to supply the referenced help elements. Overriding the control's `id()` also changes its generated warning ID.
+
+`tests/ControlGuidanceTest.php` checks these relationships across control types. Assertion failures identify the relationship, control type and ID, and rendered HTML, alongside PHPUnit's named case and expected/actual diff.
+
+### Text controls containing `div`
+
+An outer ‘<div>’ encloses the text-entry controls.
+
+In 4.4.0, `TextInput`, `EmailInput`, and `Password` rendered their `label` and `input` as siblings; no container.
+
+Update CSS child/sibling selectors, flex or grid layouts, and JavaScript traversal that assumed the old structure.
+
+```html
+<!-- 4.4.0 -->
+<label for="email">Email</label>
+<input id="email" name="email" type="text">
+
+<!-- 5.0 -->
+<div class="field">
+  <label for="email">Email</label>
+  <input id="email" name="email" type="text">
+</div>
+```
+
+### Normalized form control property methods
+
+Form control inner elements have property methods:
+
+- `containerProps()` targets the outer container,
+- `labelProps()` targets the label (or a Select group's legend), and
+- `inputProps()` targets the input, textarea, or select.
+
+For example:
+```php
+use Eightfold\HtmlBuilder\Forms\TextInput;
+
+TextInput::create('Email', 'email')
+    ->containerProps('class field')
+    ->labelProps('class field-label')
+    ->inputProps('class form-control');
+```
+
+Avoid using `inputProps()` or `labelProps()` to replace generated properties such as:
+
+- `type`,
+- `id`,
+- `name`,
+- `value`, or
+- the label's `for` association.
+
+For example, 4.4.0 allowed `TextInput::create('Email', 'email')->inputProps('type email')` to change its generated type; in 5.0, use `EmailInput` instead. Use constructor
+arguments, `id()`, or the component/mode that matches the control you need.
+
+Setting a custom ID changes the DOM ID and its generated label and warning associations, but does not change the submitted field name:
+
+```php
+TextInput::create('Email', 'account_email')->id('email-field');
+// The input has id="email-field" and name="account_email".
+```
+
+Output (human-readable):
+
+```html
+<div class="field">
+  <label class="field-label" for="email">Email</label>
+  <input id="email" class="form-control" name="email" type="text">
+</div>
+```
+
+## Updated or fixed
+
+### Radio and checkbox IDs
+
+In 4.4, `radio` and `checkbox` inputs would repeat the same name as their `id` attribute, which is invalid HTML; only one `id` with a given value per `html` element.
+
+Now, option `a` in a group named `categories` changes from `categories-a` to `categories-option-0`.
+
+Generated labels follow the new IDs automatically; update external labels, CSS selectors, and JavaScript that reference old IDs.
+
+Calling `id()` changes the group's member-ID prefix, not its submitted `name`.
+
+### `Fieldset` does not inspect child elements
+
+```php
+Fieldset::create($label, $name, $warningMessage = 'Warning message')
+```
+
+Will render one group warning with the ID `<name>-warning`.
+
+String warnings are wrapped in a paragraph and retain caller-supplied markup.
+
+`PropertyInterface` warnings retain their element, content, and other properties; the generated ID is applied to a local clone, leaving the caller's warning object unchanged. Repeated rendering is stable, and the same warning object can be reused across components with independent IDs.
+
+**`Fieldset` does not inspect or rewrite arbitrary children passed to `elements()`**:Callers remain responsible for setting `aria-invalid` and `aria-describedby` on
+member controls, including references to the group warning when appropriate.
+
+## Deprecated
+
+### `wrapperProps()` on form controls
+
+`wrapperProps()` remains callable as a forwarding alias throughout 5.x. It
+continues to set the same container properties, but is deprecated in favor of
+`containerProps()` and emits `E_USER_DEPRECATED`. The native `#[Deprecated]`
+attribute is supported by PHP 8.4 and later; removal is deferred until at
+least 6.0. See [Migrating from wrapperProps](#migrating-from-wrapperprops).
+
+In 5.0, use `containerProps()` instead of `wrapperProps()` on all form
+components. This is a rename, not a change in property handling or target
+elements. `wrapperProps()` remains a forwarding alias throughout 5.x and is
+marked with PHP's native `#[Deprecated]` attribute (supported since PHP 8.4).
+Calling it emits `E_USER_DEPRECATED`; removal is deferred until at least 6.0.
diff --git a/docs/migrating-from-050000-050100.md b/docs/migrating-from-050000-050100.md
new file mode 100644
index 0000000..9f6a0fa
--- /dev/null
+++ b/docs/migrating-from-050000-050100.md
@@ -0,0 +1,76 @@
+# Migrating from 5.0 to 5.1
+
+While not a major release, it could have been, but the potential breaking change should only impact some static analysis tools - not runtimes - and has at least two solutions that have existed for multiple versions and many of us already have in place.
+
+Otherwise, this is a quality of life improvement release.
+
+- [New](#new)
+    - [`EmptyElement`](#emptyelement) component
+- [Updated](#updated)
+    - (could cause frustration) [Static analysis](#static-analysis) may throw if the element name in an `Element` or `EmptyElement` static creation is not in the HTML specification, is not declared empty by the HTML specification, or both.
+    - (see previous) Removed all [`ignoreErrors`](https://phpstan.org/user-guide/ignoring-errors#ignoring-in-configuration-file) from the PHPStan configuration.
+    - (see previous) Increased the [PHPStan](https://phpstan.org) level for HTML Builder to 10.
+    - Expanded style and static analysis coverage to include `tests/` and `bin/` directories; not just `src/`.
+    - Form controls, `Favicons`, and `Document` use `EmptyElement` where applicable
+- Deprecated: None
+- Deleted: None
+
+## New
+
+### `EmptyElement`
+
+The first quality of life improvement is introducing an explicit way to create empty elements.
+
+The examples in the `EmptyElement` section in the [README](../README.md#emptyelement) demonstrates the improvement.
+
+In short:
+
+```php
+use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
+
+Element::img()->omitEndTag()->prop('id cat-picture', 'src /path/to/image.png');
+
+// becomes
+EmptyElement::img('id cat-picture', 'src /path/to/image.png');
+```
+
+Outputs:
+
+```html
+<img id="cat-picture" src="/path/to/image.png">
+```
+
+## Updated
+
+### Static analysis
+
+The static analysis error that’s been with PHP HTML Builder from the beginning was “Call to undefined static method”.
+
+The error could be silenced, and limited to only ignoring PHP HTML Builder, in the PHPStan configuration (the first workaround):
+
+```yaml
+ignoreErrors:
+    - '#Call to an undefined static method Eightfold\\HtmlBuilder\\Element::(.*)#'
+```
+
+We introduced the ‘create()’ named constructor, which gave a specific pattern for creating custom components and allowed users to avoid ignoring the static analysis error (the second workaround):
+
+```php
+Element::create('p', 'Hello, World!');
+```
+
+PHP HTML Builder 5.1 introduces two docblocks.
+
+[The first](../docblocks/elements-generated.txt) lists all HTML elements in the living specification. [The second](../docblocks/empty-elements-generated.txt) lists all *empty* elements in the living specification. Both are derived from sources maintained by the W3C organization and community.
+
+This means, when using the `__callStatic` magic method named constructor to create elements, if the element name is in the docblock list, static analyzers (specifically PHPStan) will *not* throw an error. Further, if the element name is not in the list, PHPStan *will* throw an error, which may be informative to users.
+
+```php
+// Works with PHPStan level 10 without extra setup
+Element::p('Hello, World!');
+```
+
+Note: You can still create custom element names while using static analysis by either calling the `create()` method directly (recommended) or ignoring via configuration.
+
+Using `create()` may enhance readability by distinguishing custom element names from those in the HTML spec.
diff --git a/docs/migrating-template.md b/docs/migrating-template.md
new file mode 100644
index 0000000..9ef4323
--- /dev/null
+++ b/docs/migrating-template.md
@@ -0,0 +1,10 @@
+# Migrating from <!-- version --> to <!-- version -->
+
+- New: none
+- Updated: None
+- Deprecated: None
+- Deleted: None
+
+## New
+
+## Updated
diff --git a/src/Components/Favicons.php b/src/Components/Favicons.php
index 321410a..625e36b 100644
--- a/src/Components/Favicons.php
+++ b/src/Components/Favicons.php
@@ -6,6 +6,7 @@
 use Stringable;
 
 use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
 
 use Eightfold\HtmlBuilder\Components\FaviconMetroColors;
 
@@ -118,36 +119,36 @@ private function safariThemeColor(): string
     public function __toString(): string
     {
         $elements = [
-            Element::link()->omitEndTag()->props(
+            EmptyElement::link(
                 'rel apple-touch-icon',
                 'sizes 180x180',
                 'href ' . $this->path() . '/apple-touch-icon.png'
             ),
-            Element::link()->omitEndTag()->props(
+            EmptyElement::link(
                 'rel icon',
                 'type image/png',
                 'sizes 32x32',
                 'href ' . $this->path() . '/favicon-32x32.png'
             ),
-            Element::link()->omitEndTag()->props(
+            EmptyElement::link(
                 'rel icon',
                 'type image/png',
                 'sizes 16x16',
                 'href ' . $this->path() . '/favicon-16x16.png'
             ),
-            Element::link()->omitEndTag()->props(
+            EmptyElement::link(
                 'rel manifest',
                 'href ' . $this->path() . '/site.webmanifest'
             ),
-            Element::meta()->omitEndTag()->props(
+            EmptyElement::meta(
                 'name msapplication-TileColor',
                 'content ' . $this->metroTileColor()
             ),
-            Element::meta()->omitEndTag()->props(
+            EmptyElement::meta(
                 'name theme-color',
                 'content ' . $this->themeColor()
             ),
-            Element::link()->omitEndTag()->props(
+            EmptyElement::link(
                 'rel mask-icon',
                 'href ' . $this->path() . '/safari-pinned-tab.svg',
                 'color ' . $this->safariThemeColor()
@@ -155,31 +156,31 @@ public function __toString(): string
         ];
 
         if ($this->hasPath()) {
-            $elements[] = Element::link()->omitEndTag()->props(
+            $elements[] = EmptyElement::link(
                 'rel shortcut icon',
                 'href ' . $this->path() . '/favicon.ico'
             );
 
-            $elements[] = Element::meta()->omitEndTag()->props(
+            $elements[] = EmptyElement::meta(
                 'name msapplication-config',
                 'content ' . $this->path() . '/browserconfig.xml'
             );
         }
 
         if ($this->hasMetro() and $this->metroUsesWhite()) {
-            $elements[] = Element::meta()->omitEndTag()->props(
+            $elements[] = EmptyElement::meta(
                 'name msapplication-TileImage',
                 'content ' . $this->path() . '/mstile-144x144.png'
             );
         }
 
         if ($this->hasAppName()) {
-            $elements[] = Element::meta()->omitEndTag()->props(
+            $elements[] = EmptyElement::meta(
                 'name application-name',
                 'content ' . $this->appName()
             );
 
-            $elements[] = Element::meta()->omitEndTag()->props(
+            $elements[] = EmptyElement::meta(
                 'name apple-mobile-web-app-title',
                 'content ' . $this->appName()
             );
diff --git a/src/Document.php b/src/Document.php
index 36363a0..98a80ea 100644
--- a/src/Document.php
+++ b/src/Document.php
@@ -6,6 +6,7 @@
 use Stringable;
 
 use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
 
 class Document implements Stringable
 {
@@ -82,7 +83,7 @@ public function toString(): string
         $html = (string) Element::html(
             Element::head(
                 $pageTitle,
-                Element::meta()->omitEndTag()->props($this->charset()),
+                EmptyElement::meta($this->charset()),
                 ...$this->headContent()
             ),
             Element::body(...$this->bodyContent())->props(...$this->bodyProps)
diff --git a/src/Forms/EmailInput.php b/src/Forms/EmailInput.php
index 4592d36..e34f599 100644
--- a/src/Forms/EmailInput.php
+++ b/src/Forms/EmailInput.php
@@ -6,6 +6,7 @@
 use Stringable;
 
 use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
 use Eightfold\HtmlBuilder\PropertyInterface;
 
 class EmailInput implements Stringable
@@ -130,7 +131,7 @@ public function __toString(): string
         $warning         = self::warningMessage();
         $inputProperties = self::inputProperties($warning === '');
 
-        $input = Element::input()->omitEndTag()->props(...[
+        $input = EmptyElement::input(...[
             ...$inputProperties,
             'type email',
             'id ' . $this->id,
diff --git a/src/Forms/Password.php b/src/Forms/Password.php
index 813c42b..2ab6c1c 100644
--- a/src/Forms/Password.php
+++ b/src/Forms/Password.php
@@ -6,6 +6,7 @@
 use Stringable;
 
 use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
 use Eightfold\HtmlBuilder\PropertyInterface;
 
 use Eightfold\HtmlBuilder\Forms\PasswordAutocomplete;
@@ -144,7 +145,7 @@ public function __toString(): string
         $warning         = self::warningMessage();
         $inputProperties = self::inputProperties($warning === '');
 
-        $input = Element::input()->omitEndTag()->props(...[
+        $input = EmptyElement::input(...[
             ...$inputProperties,
             'type password',
             'id ' . $this->id,
diff --git a/src/Forms/Select.php b/src/Forms/Select.php
index 0ebeaf0..49430dc 100644
--- a/src/Forms/Select.php
+++ b/src/Forms/Select.php
@@ -6,6 +6,7 @@
 use Stringable;
 
 use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
 use Eightfold\HtmlBuilder\PropertyInterface;
 
 use Eightfold\HtmlBuilder\Forms\ControlProperties;
@@ -273,7 +274,7 @@ private function selectGroup(
             $value = (string) $value;
             $memberId = $this->id . '-option-' . $index++;
 
-            $input = Element::input()->omitEndTag()->props(...[
+            $input = EmptyElement::input(...[
                 ...$inputProperties,
                 'id ' . $memberId,
                 'name ' . $name,
diff --git a/src/Forms/TextInput.php b/src/Forms/TextInput.php
index c0ea48a..cb3decf 100644
--- a/src/Forms/TextInput.php
+++ b/src/Forms/TextInput.php
@@ -6,6 +6,7 @@
 use Stringable;
 
 use Eightfold\HtmlBuilder\Element;
+use Eightfold\HtmlBuilder\EmptyElement;
 use Eightfold\HtmlBuilder\PropertyInterface;
 
 class TextInput implements Stringable
@@ -130,7 +131,7 @@ public function __toString(): string
         $warning         = self::warningMessage();
         $inputProperties = self::inputProperties($warning === '');
 
-        $input = Element::input()->omitEndTag()->props(...[
+        $input = EmptyElement::input(...[
             ...$inputProperties,
             'type text',
             'id ' . $this->id,