From 81091445a6fcca08616c060c0e1089272640fed4 Mon Sep 17 00:00:00 2001
From: Mattes Mohr <mail@mattesmohr.de>
Date: Thu, 11 Nov 2021 20:02:46 +0100
Subject: [PATCH] Update dependencies and other stuff (#45)

* Update dependencies and resolve warnings

* Add little changes

* Outsource the formulas in a own file

* Outsource the HTMLContext class in a own file

* Outsource the TemplateValueMapping class in a own file and rename the ContextVariable file

* Outsource the properties in a own file

* Outsource the EnvironmentModifier struct and rename the Localize file

* Add a document rendering test

* Add more rendering tests

* Add the missing tests to AllTests

* Add HTMLNode

* Change ContentNode to a generic type for elements with a different type of content

* Add the comment element

* Add HTMLDocument as a node

* Clean up

* Add some tests

* Update swift.yml
---
 .github/workflows/swift.yml                   |   4 +-
 Package.resolved                              |   4 +-
 Package.swift                                 |  23 +-
 Sources/HTMLKit/External/Attributes.swift     | 164 ++--
 Sources/HTMLKit/External/Components.swift     |  78 +-
 Sources/HTMLKit/External/Elements.swift       | 775 +++++++-----------
 Sources/HTMLKit/External/Functions.swift      |   2 +
 Sources/HTMLKit/External/Types.swift          |  17 +
 Sources/HTMLKit/Internal/Conditions.swift     | 112 ++-
 .../Internal/EnvironmentModifier.swift        |  23 +
 Sources/HTMLKit/Internal/EscapingOption.swift |   5 +-
 .../Internal/Extensions/DataTypes.swift       |  27 +-
 Sources/HTMLKit/Internal/Formulas.swift       |  68 ++
 Sources/HTMLKit/Internal/HTMLBuilder.swift    |   6 +-
 Sources/HTMLKit/Internal/HTMLDocument.swift   |  56 --
 Sources/HTMLKit/Internal/HTMLRenderer.swift   |  70 +-
 .../{Localize.swift => Localized.swift}       |  57 +-
 .../{ => Mapping}/HTMLAttribute.swift         |  13 +-
 .../Internal/{ => Mapping}/HTMLContent.swift  |  35 +-
 .../Internal/Mapping/HTMLContext.swift        | 105 +++
 .../HTMLKit/Internal/Mapping/HTMLNode.swift   |  89 ++
 Sources/HTMLKit/Internal/Nodes.swift          | 156 ++--
 .../Internal/Properties/Conditionable.swift   |  18 +
 .../Internal/Properties/Defineable.swift      |   7 +
 .../Internal/Properties/Localizable.swift     |  16 +
 .../Internal/Properties/Renderable.swift      |  52 ++
 .../Internal/TemplateValueMapping.swift       |  27 +
 .../Internal/Variables/ContextVariable.swift  |  56 ++
 .../Variables/ContextualVariable.swift        | 234 ------
 .../Internal/Variables/DateVariable.swift     |  33 +-
 .../Internal/Variables/StringValue.swift      |   9 +
 .../Internal/Variables/TemplateValue.swift    |  15 +-
 Tests/HTMLKitTests/PerformanceTests.swift     |  69 +-
 Tests/HTMLKitTests/RenderingTests.swift       |  87 +-
 34 files changed, 1248 insertions(+), 1264 deletions(-)
 create mode 100644 Sources/HTMLKit/Internal/EnvironmentModifier.swift
 create mode 100644 Sources/HTMLKit/Internal/Formulas.swift
 delete mode 100644 Sources/HTMLKit/Internal/HTMLDocument.swift
 rename Sources/HTMLKit/Internal/{Localize.swift => Localized.swift} (50%)
 rename Sources/HTMLKit/Internal/{ => Mapping}/HTMLAttribute.swift (74%)
 rename Sources/HTMLKit/Internal/{ => Mapping}/HTMLContent.swift (53%)
 create mode 100644 Sources/HTMLKit/Internal/Mapping/HTMLContext.swift
 create mode 100644 Sources/HTMLKit/Internal/Mapping/HTMLNode.swift
 create mode 100644 Sources/HTMLKit/Internal/Properties/Conditionable.swift
 create mode 100644 Sources/HTMLKit/Internal/Properties/Defineable.swift
 create mode 100644 Sources/HTMLKit/Internal/Properties/Localizable.swift
 create mode 100644 Sources/HTMLKit/Internal/Properties/Renderable.swift
 create mode 100644 Sources/HTMLKit/Internal/TemplateValueMapping.swift
 create mode 100644 Sources/HTMLKit/Internal/Variables/ContextVariable.swift
 delete mode 100644 Sources/HTMLKit/Internal/Variables/ContextualVariable.swift
 create mode 100644 Sources/HTMLKit/Internal/Variables/StringValue.swift

diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index 32d09b1e..44fae0d3 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -24,7 +24,7 @@ jobs:
   xenial:
     needs: check-doc-coverage
     container: 
-      image: swift:5.1.3-xenial
+      image: swift:5.4.3-xenial
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1.2.0
@@ -33,7 +33,7 @@ jobs:
   bionic:
     needs: check-doc-coverage
     container: 
-      image: swift:5.1.3-bionic
+      image: swift:5.4.3-bionic
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1.2.0
diff --git a/Package.resolved b/Package.resolved
index 422eca65..3d6b88df 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/miroslavkovac/Lingo.git",
         "state": {
           "branch": null,
-          "revision": "f21f388b04239641b3e88d14f21762125faa9857",
-          "version": "3.0.5"
+          "revision": "e4b032f65bde917209a1cb0962c0fd13fa0add2f",
+          "version": "3.1.0"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
index 69fe7697..debdd42c 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.4
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -9,26 +9,25 @@ let package = Package(
       .macOS(.v10_14),
     ],
     products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "HTMLKit",
-            targets: ["HTMLKit"])
+            targets: ["HTMLKit"]
+        )
     ],
     dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-
-        .package(url: "https://github.com/miroslavkovac/Lingo.git", from: "3.0.5"),
-//        .package(url: "https://github.com/vapor-community/markdown.git", .upToNextMajor(from: "0.4.0")),
+        .package(url: "https://github.com/miroslavkovac/Lingo.git", from: "3.1.0"),
     ],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "HTMLKit",
-            dependencies: ["Lingo"]),
+            dependencies: ["Lingo"]
+        ),
         .testTarget(
             name: "HTMLKitTests",
-            dependencies: ["HTMLKit"]),
+            dependencies: ["HTMLKit"],
+            resources: [
+                .process("Localization")
+            ]
+        )
     ]
 )
diff --git a/Sources/HTMLKit/External/Attributes.swift b/Sources/HTMLKit/External/Attributes.swift
index 2f6136e2..864f8272 100644
--- a/Sources/HTMLKit/External/Attributes.swift
+++ b/Sources/HTMLKit/External/Attributes.swift
@@ -44,7 +44,7 @@ public protocol GlobalAttributes {
     func on(click: HTMLContent) -> Self
 }
 
-extension GlobalAttributes where Self: AttributeNode {
+extension GlobalAttributes where Self: HTMLNode {
 
     public func aria(for key: String, value: HTMLContent) -> Self {
         add(.init(attribute: "aria-" + key, value: value))
@@ -127,7 +127,7 @@ public protocol AcceptAttribute {
     func accept(_ value: HTMLContent) -> Self
 }
 
-extension AcceptAttribute where Self: AttributeNode {
+extension AcceptAttribute where Self: HTMLNode {
     
     public func accept(_ value: HTMLContent) -> Self {
         add(.init(attribute: "accept", value: value))
@@ -142,7 +142,7 @@ public protocol ActionAttribute {
     func action(_ value: HTMLContent) -> Self
 }
 
-extension ActionAttribute where Self: AttributeNode {
+extension ActionAttribute where Self: HTMLNode {
     
     public func action(_ value: HTMLContent) -> Self {
         add(.init(attribute: "action", value: value))
@@ -157,7 +157,7 @@ public protocol AlternativeAttribute {
     func alternative(_ value: HTMLContent) -> Self
 }
 
-extension AlternativeAttribute where Self: AttributeNode {
+extension AlternativeAttribute where Self: HTMLNode {
     
     public func alternative(_ value: HTMLContent) -> Self {
         add(.init(attribute: "alt", value: value))
@@ -172,7 +172,7 @@ public protocol AsyncAttribute {
     func async() -> Self
 }
 
-extension AsyncAttribute where Self: AttributeNode {
+extension AsyncAttribute where Self: HTMLNode {
     
     public func async() -> Self {
         add(.init(attribute: "async", value: nil))
@@ -187,7 +187,7 @@ public protocol AutoCompleteAttribute {
     func autoComplete(_ condition: Conditionable) -> Self
 }
 
-extension AutoCompleteAttribute where Self: AttributeNode {
+extension AutoCompleteAttribute where Self: HTMLNode {
     
     public func autoComplete(_ condition: Conditionable) -> Self {
         add(.init(attribute: "autocomplete", value: nil, isIncluded: condition))
@@ -202,7 +202,7 @@ public protocol AutoFocusAttribute {
     func autoFocus() -> Self
 }
 
-extension AutoFocusAttribute where Self: AttributeNode {
+extension AutoFocusAttribute where Self: HTMLNode {
     
     public func autoFocus() -> Self {
         add(.init(attribute: "autofocus", value: nil))
@@ -217,7 +217,7 @@ public protocol AutoPlayAttribute {
     func autoPlay() -> Self
 }
 
-extension AutoPlayAttribute where Self: AttributeNode {
+extension AutoPlayAttribute where Self: HTMLNode {
     
     public func autoPlay() -> Self {
         add(.init(attribute: "autoplay", value: nil))
@@ -232,7 +232,7 @@ public protocol CheckedAttribute {
     func checked() -> Self
 }
 
-extension CheckedAttribute where Self: AttributeNode {
+extension CheckedAttribute where Self: HTMLNode {
     
     public func checked() -> Self {
         add(.init(attribute: "checked", value: nil))
@@ -247,7 +247,7 @@ public protocol CiteAttribute {
     func cite(_ text: HTMLContent) -> Self
 }
 
-extension CiteAttribute where Self: AttributeNode {
+extension CiteAttribute where Self: HTMLNode {
     
     public func cite(_ text: HTMLContent) -> Self {
         add(.init(attribute: "cite", value: text))
@@ -262,7 +262,7 @@ public protocol ColumnsAttribute {
     func columns(_ size: Int) -> Self
 }
 
-extension ColumnsAttribute where Self: AttributeNode {
+extension ColumnsAttribute where Self: HTMLNode {
     
     public func columns(_ size: Int) -> Self {
         add(.init(attribute: "cols", value: size))
@@ -277,7 +277,7 @@ public protocol ColumnSpanAttribute {
     func columnSpan(_ size: Int) -> Self
 }
 
-extension ColumnSpanAttribute where Self: AttributeNode {
+extension ColumnSpanAttribute where Self: HTMLNode {
     
     public func columnSpan(_ size: Int) -> Self {
         add(.init(attribute: "colspan", value: size))
@@ -292,7 +292,7 @@ public protocol ContentAttribute {
     func content(_ value: HTMLContent) -> Self
 }
 
-extension ContentAttribute where Self: AttributeNode {
+extension ContentAttribute where Self: HTMLNode {
     
     public func content(_ value: HTMLContent) -> Self {
         add(.init(attribute: "content", value: value))
@@ -307,7 +307,7 @@ public protocol ControlsAttribute {
     func controls() -> Self
 }
 
-extension ControlsAttribute where Self: AttributeNode {
+extension ControlsAttribute where Self: HTMLNode {
     
     public func controls() -> Self {
         add(.init(attribute: "controls", value: nil))
@@ -322,7 +322,7 @@ public protocol CoordinatesAttribute {
     func coordinates(_ value: HTMLContent) -> Self
 }
 
-extension CoordinatesAttribute where Self: AttributeNode {
+extension CoordinatesAttribute where Self: HTMLNode {
     
     public func coordinates(_ value: HTMLContent) -> Self {
         add(.init(attribute: "coords", value: value))
@@ -337,7 +337,7 @@ public protocol DataAttribute {
     func data(_ value: HTMLContent) -> Self
 }
 
-extension DataAttribute where Self: AttributeNode {
+extension DataAttribute where Self: HTMLNode {
     
     public func data(_ value: HTMLContent) -> Self {
         add(.init(attribute: "data", value: value))
@@ -352,7 +352,7 @@ public protocol DateTimeAttribute {
     func dateTime(_ value: HTMLContent) -> Self
 }
 
-extension DateTimeAttribute where Self: AttributeNode {
+extension DateTimeAttribute where Self: HTMLNode {
     
     public func dateTime(_ value: HTMLContent) -> Self {
         add(.init(attribute: "datetime", value: value))
@@ -367,7 +367,7 @@ public protocol DefaultAttribute {
     func `default`() -> Self
 }
 
-extension DefaultAttribute where Self: AttributeNode {
+extension DefaultAttribute where Self: HTMLNode {
     
     public func `default`() -> Self {
         add(.init(attribute: "default", value: nil))
@@ -382,7 +382,7 @@ public protocol DisabledAttribute {
     func disabled() -> Self
 }
 
-extension DisabledAttribute where Self: AttributeNode {
+extension DisabledAttribute where Self: HTMLNode {
     
     public func disabled() -> Self {
         add(.init(attribute: "disabled", value: nil))
@@ -397,7 +397,7 @@ public protocol DownloadAttribute {
     func download() -> Self
 }
 
-extension DownloadAttribute where Self: AttributeNode {
+extension DownloadAttribute where Self: HTMLNode {
     
     public func download() -> Self {
         add(.init(attribute: "download", value: nil))
@@ -412,7 +412,7 @@ public protocol EncodingAttribute {
     func encoding(_ type: EncodeType) -> Self
 }
 
-extension EncodingAttribute where Self: AttributeNode {
+extension EncodingAttribute where Self: HTMLNode {
 
     public func encoding(_ type: EncodeType) -> Self {
         add(.init(attribute: "enctype", value: type.rawValue))
@@ -427,7 +427,7 @@ public protocol ForAttribute {
     func `for`(_ value: HTMLContent) -> Self
 }
 
-extension ForAttribute where Self: AttributeNode {
+extension ForAttribute where Self: HTMLNode {
     
     public func `for`(_ value: HTMLContent) -> Self {
         add(.init(attribute: "for", value: value))
@@ -442,7 +442,7 @@ public protocol FormAttribute {
     func form(_ value: HTMLContent) -> Self
 }
 
-extension FormAttribute where Self: AttributeNode {
+extension FormAttribute where Self: HTMLNode {
     
     public func form(_ value: HTMLContent) -> Self {
         add(.init(attribute: "form", value: value))
@@ -457,7 +457,7 @@ public protocol FormActionAttribute {
     func formAction(_ value: HTMLContent) -> Self
 }
 
-extension FormActionAttribute where Self: AttributeNode {
+extension FormActionAttribute where Self: HTMLNode {
     
     public func formAction(_ value: HTMLContent) -> Self {
         add(.init(attribute: "formaction", value: value))
@@ -472,7 +472,7 @@ public protocol HeaderAttribute {
     func header(_ value: HTMLContent) -> Self
 }
 
-extension HeaderAttribute where Self: AttributeNode {
+extension HeaderAttribute where Self: HTMLNode {
     
     public func header(_ value: HTMLContent) -> Self {
         add(.init(attribute: "header", value: value))
@@ -487,7 +487,7 @@ public protocol HeightAttribute {
     func height(_ height: Int) -> Self
 }
 
-extension HeightAttribute where Self: AttributeNode {
+extension HeightAttribute where Self: HTMLNode {
     
     public func height(_ height: Int) -> Self {
         add(.init(attribute: "height", value: height))
@@ -502,7 +502,7 @@ public protocol HighAttribute {
     func high(_ height: Int) -> Self
 }
 
-extension HighAttribute where Self: AttributeNode {
+extension HighAttribute where Self: HTMLNode {
     
     public func high(_ height: Int) -> Self {
         add(.init(attribute: "high", value: height))
@@ -517,7 +517,7 @@ public protocol ReferenceAttribute {
     func reference(_ value: HTMLContent) -> Self
 }
 
-extension ReferenceAttribute where Self: AttributeNode {
+extension ReferenceAttribute where Self: HTMLNode {
     
     public func reference(_ value: HTMLContent) -> Self {
         add(.init(attribute: "href", value: value))
@@ -532,7 +532,7 @@ public protocol ReferenceLanguageAttribute {
     func referenceLanguage(_ type: LanguageType) -> Self
 }
 
-extension ReferenceLanguageAttribute where Self: AttributeNode {
+extension ReferenceLanguageAttribute where Self: HTMLNode {
 
     public func referenceLanguage(_ type: LanguageType) -> Self {
         add(.init(attribute: "hreflang", value: type.rawValue))
@@ -547,7 +547,7 @@ public protocol KindAttribute {
     func kind(_ text: HTMLContent) -> Self
 }
 
-extension KindAttribute where Self: AttributeNode {
+extension KindAttribute where Self: HTMLNode {
     
     public func kind(_ text: HTMLContent) -> Self {
         add(.init(attribute: "kind", value: text))
@@ -562,7 +562,7 @@ public protocol LabelAttribute {
     func label(_ value: HTMLContent) -> Self
 }
 
-extension LabelAttribute where Self: AttributeNode {
+extension LabelAttribute where Self: HTMLNode {
     
     public func label(_ value: HTMLContent) -> Self {
         add(.init(attribute: "label", value: value))
@@ -577,7 +577,7 @@ public protocol ListAttribute {
     func list(_ value: HTMLContent) -> Self
 }
 
-extension ListAttribute where Self: AttributeNode {
+extension ListAttribute where Self: HTMLNode {
     
     public func list(_ value: HTMLContent) -> Self {
         add(.init(attribute: "list", value: value))
@@ -592,7 +592,7 @@ public protocol LoopAttribute {
     func loop() -> Self
 }
 
-extension LoopAttribute where Self: AttributeNode {
+extension LoopAttribute where Self: HTMLNode {
     
     public func loop() -> Self {
         add(.init(attribute: "loop", value: nil))
@@ -607,7 +607,7 @@ public protocol MaximumValueAttribute {
     func maximumValue(value: HTMLContent) -> Self
 }
 
-extension MaximumValueAttribute where Self: AttributeNode {
+extension MaximumValueAttribute where Self: HTMLNode {
 
     public func maximumValue(value: HTMLContent) -> Self {
         add(.init(attribute: "max", value: value))
@@ -622,7 +622,7 @@ public protocol MaximumLengthAttribute {
     func maximumLength(value: HTMLContent) -> Self
 }
 
-extension MaximumLengthAttribute where Self: AttributeNode {
+extension MaximumLengthAttribute where Self: HTMLNode {
 
     public func maximumLength(value: HTMLContent) -> Self {
         add(.init(attribute: "maxlength", value: value))
@@ -637,7 +637,7 @@ public protocol MediaAttribute {
     func media(value: HTMLContent) -> Self
 }
 
-extension MediaAttribute where Self: AttributeNode {
+extension MediaAttribute where Self: HTMLNode {
 
     public func media(value: HTMLContent) -> Self {
         add(.init(attribute: "media", value: value))
@@ -652,7 +652,7 @@ public protocol MethodAttribute {
     func method(_ method: MethodType) -> Self
 }
 
-extension MethodAttribute where Self: AttributeNode {
+extension MethodAttribute where Self: HTMLNode {
 
     public func method(_ method: MethodType) -> Self {
         add(.init(attribute: "method", value: method.rawValue))
@@ -667,7 +667,7 @@ public protocol MinimumValueAttribute {
     func minimumValue(value: HTMLContent) -> Self
 }
 
-extension MinimumValueAttribute where Self: AttributeNode {
+extension MinimumValueAttribute where Self: HTMLNode {
 
     public func minimumValue(value: HTMLContent) -> Self {
         add(.init(attribute: "min", value: value))
@@ -682,7 +682,7 @@ public protocol MinimumLengthAttribute {
     func minimumLength(value: HTMLContent) -> Self
 }
 
-extension MinimumLengthAttribute where Self: AttributeNode {
+extension MinimumLengthAttribute where Self: HTMLNode {
 
     public func minimumLength(value: HTMLContent) -> Self {
         add(.init(attribute: "minlength", value: value))
@@ -697,7 +697,7 @@ public protocol MultipleAttribute {
     func multiple() -> Self
 }
 
-extension MultipleAttribute where Self: AttributeNode {
+extension MultipleAttribute where Self: HTMLNode {
     
     public func multiple() -> Self {
         add(.init(attribute: "multiple", value: nil))
@@ -712,7 +712,7 @@ public protocol MutedAttribute {
     func muted() -> Self
 }
 
-extension MutedAttribute where Self: AttributeNode {
+extension MutedAttribute where Self: HTMLNode {
     
     public func muted() -> Self {
         add(.init(attribute: "muted", value: nil))
@@ -724,22 +724,14 @@ extension MutedAttribute where Self: AttributeNode {
 ///
 public protocol NameAttribute {
 
-    associatedtype NameType: RawRepresentable where NameType.RawValue == String
-
     func name(_ value: NameType) -> Self
-
-    func name(_ value: TemplateValue<String>) -> Self
 }
 
-extension NameAttribute where Self: AttributeNode {
+extension NameAttribute where Self: HTMLNode {
     
     public func name(_ value: NameType) -> Self {
         add(.init(attribute: "name", value: value.rawValue))
     }
-
-    public func name(_ value: TemplateValue<String>) -> Self {
-        add(.init(attribute: "name", value: value))
-    }
 }
 
 /// The protocol provides
@@ -750,7 +742,7 @@ public protocol OpenAttribute {
     func isOpen(_ condition: Conditionable) -> Self
 }
 
-extension OpenAttribute where Self: AttributeNode {
+extension OpenAttribute where Self: HTMLNode {
     
     public func isOpen(_ condition: Conditionable) -> Self {
         add(.init(attribute: "open", value: nil, isIncluded: condition))
@@ -765,7 +757,7 @@ public protocol OptimumAttribute {
     func optimum(_ value: HTMLContent) -> Self
 }
 
-extension OptimumAttribute where Self: AttributeNode {
+extension OptimumAttribute where Self: HTMLNode {
     
     public func optimum(_ value: HTMLContent) -> Self {
         add(.init(attribute: "optimum", value: value))
@@ -780,7 +772,7 @@ public protocol PatternAttribute {
     func pattern(_ regex: String) -> Self
 }
 
-extension AttributeNode where Self: PatternAttribute {
+extension PatternAttribute where Self: HTMLNode {
     
     public func pattern(_ regex: String) -> Self {
         add(.init(attribute: "pattern", value: regex))
@@ -795,7 +787,7 @@ public protocol PingAttribute {
     func ping(_ value: HTMLContent) -> Self
 }
 
-extension PingAttribute where Self: AttributeNode {
+extension PingAttribute where Self: HTMLNode {
 
     public func ping(_ value: HTMLContent) -> Self {
         add(.init(attribute: "ping", value: value))
@@ -810,7 +802,7 @@ public protocol PlaceholderAttribute {
     func placeholder(_ text: HTMLContent) -> Self
 }
 
-extension PlaceholderAttribute where Self: AttributeNode {
+extension PlaceholderAttribute where Self: HTMLNode {
     
     public func placeholder(_ text: HTMLContent) -> Self {
         add(.init(attribute: "placeholder", value: text))
@@ -832,7 +824,7 @@ public protocol PosterAttribute {
     func poster(value: HTMLContent) -> Self
 }
 
-extension PosterAttribute where Self: AttributeNode {
+extension PosterAttribute where Self: HTMLNode {
 
     public func poster(value: HTMLContent) -> Self {
         add(.init(attribute: "poster", value: value))
@@ -847,7 +839,7 @@ public protocol ReadyOnlyAttribute {
     func readonly() -> Self
 }
 
-extension ReadyOnlyAttribute where Self: AttributeNode {
+extension ReadyOnlyAttribute where Self: HTMLNode {
     
     public func readonly() -> Self {
         add(.init(attribute: "readonly", value: nil))
@@ -862,7 +854,7 @@ public protocol ReferrerPolicyAttribute {
     func referrerPolicy(_ type: PolicyType) -> Self
 }
 
-extension ReferrerPolicyAttribute where Self: AttributeNode {
+extension ReferrerPolicyAttribute where Self: HTMLNode {
 
     public func referrerPolicy(_ type: PolicyType) -> Self {
         add(.init(attribute: "referrerpolicy", value: type.rawValue))
@@ -874,14 +866,12 @@ extension ReferrerPolicyAttribute where Self: AttributeNode {
 ///
 public protocol RelationshipAttribute {
     
-    associatedtype RelationshipTypes: RawRepresentable where RelationshipTypes.RawValue == String
-    
-    func relationship(_ value: RelationshipTypes) -> Self
+    func relationship(_ value: RelationshipType) -> Self
 }
 
-extension RelationshipAttribute where Self: AttributeNode {
+extension RelationshipAttribute where Self: HTMLNode {
     
-    public func relationship(_ value: RelationshipTypes) -> Self {
+    public func relationship(_ value: RelationshipType) -> Self {
         add(.init(attribute: "rel", value: value.rawValue))
     }
 }
@@ -894,7 +884,7 @@ public protocol RequiredAttribute {
     func required() -> Self
 }
 
-extension RequiredAttribute where Self: AttributeNode {
+extension RequiredAttribute where Self: HTMLNode {
     
     public func required() -> Self {
         add(.init(attribute: "required", value: nil))
@@ -909,7 +899,7 @@ public protocol ReversedAttribute {
     func reversed() -> Self
 }
 
-extension ReversedAttribute where Self: AttributeNode {
+extension ReversedAttribute where Self: HTMLNode {
     
     public func reversed() -> Self {
         add(.init(attribute: "reversed", value: nil))
@@ -924,7 +914,7 @@ public protocol RowsAttribute {
     func rows(_ size: Int) -> Self
 }
 
-extension RowsAttribute where Self: AttributeNode {
+extension RowsAttribute where Self: HTMLNode {
 
     public func rows(_ size: Int) -> Self {
         add(.init(attribute: "rows", value: size))
@@ -939,7 +929,7 @@ public protocol RowSpanAttribute {
     func rowSpan(_ size: Int) -> Self
 }
 
-extension RowSpanAttribute where Self: AttributeNode {
+extension RowSpanAttribute where Self: HTMLNode {
 
     public func rowSpan(_ size: Int) -> Self {
         add(.init(attribute: "rowspan", value: size))
@@ -954,7 +944,7 @@ public protocol SandboxAttribute {
     func sandbox() -> Self
 }
 
-extension SandboxAttribute where Self: AttributeNode {
+extension SandboxAttribute where Self: HTMLNode {
     
     public func sandbox() -> Self {
         add(.init(attribute: "sandbox", value: nil))
@@ -969,7 +959,7 @@ public protocol ScopeAttribute {
     func scope(_ text: HTMLContent) -> Self
 }
 
-extension ScopeAttribute where Self: AttributeNode {
+extension ScopeAttribute where Self: HTMLNode {
 
     public func scope(_ text: HTMLContent) -> Self {
         add(.init(attribute: "scope", value: text))
@@ -984,7 +974,7 @@ public protocol ShapeAttribute {
     func shape(_ type: ShapeType) -> Self
 }
 
-extension ShapeAttribute where Self: AttributeNode {
+extension ShapeAttribute where Self: HTMLNode {
 
     public func shape(_ type: ShapeType) -> Self {
         add(.init(attribute: "shape", value: type.rawValue))
@@ -999,7 +989,7 @@ public protocol SizeAttribute {
     func size(_ size: Int) -> Self
 }
 
-extension SizeAttribute where Self: AttributeNode {
+extension SizeAttribute where Self: HTMLNode {
 
     public func size(_ size: Int) -> Self {
         add(.init(attribute: "size", value: size))
@@ -1014,7 +1004,7 @@ public protocol SizesAttribute {
     func sizes(_ size: Int) -> Self
 }
 
-extension SizesAttribute where Self: AttributeNode {
+extension SizesAttribute where Self: HTMLNode {
 
     public func sizes(_ size: Int) -> Self {
         add(.init(attribute: "sizes", value: size))
@@ -1029,7 +1019,7 @@ public protocol SpanAttribute {
     func span(_ size: Int) -> Self
 }
 
-extension SpanAttribute where Self: AttributeNode {
+extension SpanAttribute where Self: HTMLNode {
 
     public func span(_ size: Int) -> Self {
         add(.init(attribute: "span", value: size))
@@ -1044,7 +1034,7 @@ public protocol SourceAttribute {
     func source(_ link: HTMLContent) -> Self
 }
 
-extension SourceAttribute where Self: AttributeNode {
+extension SourceAttribute where Self: HTMLNode {
     
     public func source(_ link: HTMLContent) -> Self {
         add(.init(attribute: "src", value: link))
@@ -1059,7 +1049,7 @@ public protocol StartAttribute {
     func start(_ size: Int) -> Self
 }
 
-extension StartAttribute where Self: AttributeNode {
+extension StartAttribute where Self: HTMLNode {
 
     public func start(_ size: Int) -> Self {
         add(.init(attribute: "start", value: size))
@@ -1074,7 +1064,7 @@ public protocol StepAttribute {
     func step(_ size: Int) -> Self
 }
 
-extension StepAttribute where Self: AttributeNode {
+extension StepAttribute where Self: HTMLNode {
 
     public func step(_ size: Int) -> Self {
         add(.init(attribute: "step", value: size))
@@ -1089,7 +1079,7 @@ public protocol TargetAttribute {
     func target(_ type: TargetType) -> Self
 }
 
-extension TargetAttribute where Self: AttributeNode {
+extension TargetAttribute where Self: HTMLNode {
     
     public func target(_ type: TargetType) -> Self {
         add(.init(attribute: "target", value: type.rawValue))
@@ -1104,7 +1094,7 @@ public protocol TypeAttribute {
     func type(_ value: TemplateValue<String>) -> Self
 }
 
-extension TypeAttribute where Self: AttributeNode {
+extension TypeAttribute where Self: HTMLNode {
     
     public func type(_ value: TemplateValue<String>) -> Self {
         add(.init(attribute: "type", value: value))
@@ -1119,7 +1109,7 @@ public protocol ValueAttribute {
     func value(_ text: HTMLContent) -> Self
 }
 
-extension ValueAttribute where Self: AttributeNode {
+extension ValueAttribute where Self: HTMLNode {
 
     public func value(_ text: HTMLContent) -> Self {
         add(.init(attribute: "value", value: text))
@@ -1134,7 +1124,7 @@ public protocol WidthAttribute {
     func width(_ width: Int) -> Self
 }
 
-extension WidthAttribute where Self: AttributeNode {
+extension WidthAttribute where Self: HTMLNode {
 
     public func width(_ width: Int) -> Self {
         add(.init(attribute: "width", value: width))
@@ -1149,9 +1139,21 @@ public protocol WrapAttribute {
     func wrap(_ type: WrapType) -> Self
 }
 
-extension WrapAttribute where Self: AttributeNode {
+extension WrapAttribute where Self: HTMLNode {
 
     public func wrap(_ type: WrapType) -> Self {
         add(.init(attribute: "wrap", value: type.rawValue))
     }
 }
+
+public protocol PropertyAttribute {
+    
+    func property(_ type: OpenGraphType) -> Self
+}
+
+extension PropertyAttribute where Self: HTMLNode {
+    
+    public func property(_ type: OpenGraphType) -> Self {
+        add(.init(attribute: "property", value: type.rawValue))
+    }
+}
diff --git a/Sources/HTMLKit/External/Components.swift b/Sources/HTMLKit/External/Components.swift
index ab542518..9e59f8b1 100644
--- a/Sources/HTMLKit/External/Components.swift
+++ b/Sources/HTMLKit/External/Components.swift
@@ -1,7 +1,9 @@
+// MARK: components
+
 /// The component ist for
 ///
 ///
-public struct MetaTitle: HTMLComponent, AttributeNode, LocalizableNode {
+public struct MetaTitle: HTMLComponent, Localizable {
 
     struct Node: ContentNode {
         public var name: String { "title" }
@@ -11,16 +13,27 @@ public struct MetaTitle: HTMLComponent, AttributeNode, LocalizableNode {
         public var content: HTMLContent
     }
 
-    let content: HTMLContent
+    public let content: HTMLContent
+    
     public var attributes: [HTMLAttribute]
-    let useOpenGraphMetadata: Conditionable
-    let useTwitterMetadata: Conditionable
+    
+    public let useOpenGraphMetadata: Conditionable
+    
+    public let useTwitterMetadata: Conditionable
 
     public var body: HTMLContent {
         [
             Node(attributes: attributes, content: content),
-            IF(useOpenGraphMetadata) { Meta().property("og:title").content(content) },
-            IF(useTwitterMetadata) { Meta().name("twitter:title").content(content) }
+            IF(useOpenGraphMetadata) {
+                Meta()
+                    .property(.title)
+                    .content(content)
+            },
+            IF(useTwitterMetadata) {
+                Meta()
+                    .property(.title)
+                    .content(content)
+            }
         ]
     }
 
@@ -45,7 +58,7 @@ public struct MetaTitle: HTMLComponent, AttributeNode, LocalizableNode {
         useTwitterMetadata = true
     }
 
-    init(attributes: [HTMLAttribute] = [], content: HTMLContent = "", useOpenGraphMetadata: Conditionable = true, useTwitterMetadata: Conditionable = true) {
+    public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "", useOpenGraphMetadata: Conditionable = true, useTwitterMetadata: Conditionable = true) {
         self.content = content
         self.attributes = attributes
         self.useOpenGraphMetadata = useOpenGraphMetadata
@@ -71,7 +84,7 @@ public struct MetaTitle: HTMLComponent, AttributeNode, LocalizableNode {
 public struct Stylesheet: HTMLComponent {
 
     @TemplateValue(String.self)
-    var url
+    public var url
 
     public init(url: TemplateValue<String>) {
         self.url = url
@@ -92,18 +105,29 @@ public struct Stylesheet: HTMLComponent {
 /// The component ist for
 ///
 ///
-public struct MetaDescription: HTMLComponent, LocalizableNode {
+public struct MetaDescription: HTMLComponent, Localizable {
 
-    var description: HTMLContent
+    public var description: HTMLContent
 
-    let useOpenGraphMetadata: Conditionable
-    let useTwitterMetadata: Conditionable
+    public let useOpenGraphMetadata: Conditionable
+    
+    public let useTwitterMetadata: Conditionable
 
     public var body: HTMLContent {
         [
-            Meta().name(.description).content(description),
-            IF(useOpenGraphMetadata) { Meta().property("og:description").content(description) },
-            IF(useTwitterMetadata) { Meta().name("twitter:description").content(description) }
+            Meta()
+                .property(.description)
+                .content(description),
+            IF(useOpenGraphMetadata) {
+                Meta()
+                    .property(.description)
+                    .content(description)
+            },
+            IF(useTwitterMetadata) {
+                Meta()
+                    .property(.description)
+                    .content(description)
+            }
         ]
     }
 
@@ -125,7 +149,7 @@ public struct MetaDescription: HTMLComponent, LocalizableNode {
         self.useOpenGraphMetadata = true
     }
 
-    init(description: HTMLContent, useOpenGraphMetadata: Conditionable, useTwitterMetadata: Conditionable) {
+    public init(description: HTMLContent, useOpenGraphMetadata: Conditionable, useTwitterMetadata: Conditionable) {
         self.description = description
         self.useOpenGraphMetadata = useOpenGraphMetadata
         self.useTwitterMetadata = useTwitterMetadata
@@ -145,7 +169,7 @@ public struct MetaDescription: HTMLComponent, LocalizableNode {
 ///
 public struct FavIcon: HTMLComponent {
 
-    let url: TemplateValue<String>
+    public let url: TemplateValue<String>
 
     public init(url: String) {
         self.url = .constant(url)
@@ -179,8 +203,8 @@ public struct Viewport: HTMLComponent {
         }
     }
 
-    var mode: WidthMode
-    var internalScale: Double = 1
+    public var mode: WidthMode
+    public var internalScale: Double = 1
 
     public init(_ mode: WidthMode, internalScale: Double = 1) {
         self.mode = mode
@@ -188,25 +212,29 @@ public struct Viewport: HTMLComponent {
     }
 
     public var body: HTMLContent {
-        Meta().name(.viewport).content("width=\(mode.width), initial-scale=\(internalScale)")
+        Meta()
+            .name(.viewport)
+            .content("width=\(mode.width), initial-scale=\(internalScale)")
     }
 }
 
 /// The component ist for
 ///
 ///
-public struct Author: HTMLComponent, LocalizableNode {
+public struct Author: HTMLComponent, Localizable {
 
-    var author: HTMLContent
+    public var author: HTMLContent
 
     @TemplateValue(String?.self)
-    var twitterHandle
+    public var twitterHandle
 
     public var body: HTMLContent {
         [
             Meta().name(.author).content(author),
             Unwrap(twitterHandle) { handle in
-                Meta().name("twitter:creator").content(handle)
+                Meta()
+                    .name(.init(rawValue: "twitter:creator")!)
+                    .content(handle)
             }
         ]
     }
@@ -223,7 +251,7 @@ public struct Author: HTMLComponent, LocalizableNode {
         author = Localized(key: localizedKey, context: context)
     }
 
-    init(author: HTMLContent, handle: TemplateValue<String?>) {
+    public init(author: HTMLContent, handle: TemplateValue<String?>) {
         self.author = author
         self.twitterHandle = handle
     }
diff --git a/Sources/HTMLKit/External/Elements.swift b/Sources/HTMLKit/External/Elements.swift
index e955ba3f..f6e76bb1 100644
--- a/Sources/HTMLKit/External/Elements.swift
+++ b/Sources/HTMLKit/External/Elements.swift
@@ -1,4 +1,5 @@
 // MARK: aliases
+
 public typealias Nav = Navigation
 public typealias H1 = Heading1
 public typealias H2 = Heading2
@@ -51,7 +52,31 @@ public typealias Td = DataCell
 public typealias Th = HeaderCell
 public typealias Optgroup = OptionGroup
 
-// MARK: structs
+// MARK: elements
+
+/// The `<!--` element represents a comment.
+///
+///
+public struct Comment: CommentNode {
+    
+    public var content: String
+    
+    public init(_ content: String) {
+        self.content = content
+    }
+}
+
+/// The `<!DOCTYPE>` element represents a comment.
+///
+///
+public struct Document: DocumentNode {
+    
+    public var content: String
+    
+    public init(type: DocumentType) {
+        self.content = type.rawValue
+    }
+}
 
 /// The `<head>`element
 ///
@@ -64,8 +89,8 @@ public struct Head: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -83,13 +108,13 @@ public struct Title: ContentNode {
 
     public var attributes: [HTMLAttribute] = []
 
-    public var content: HTMLContent
+    public var content: String
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(content: () -> String) {
+        self.content = content()
     }
 
-    public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
+    public init(attributes: [HTMLAttribute] = [], content: String = "") {
         self.content = content
         self.attributes = attributes
     }
@@ -114,27 +139,6 @@ public struct Base: EmptyNode, ReferenceAttribute, TargetAttribute {
 ///
 public struct Link: EmptyNode, ReferenceAttribute, ReferenceLanguageAttribute, MediaAttribute, ReferrerPolicyAttribute, RelationshipAttribute, SizesAttribute, TypeAttribute {
 
-    public enum RelationshipTypes: String {
-
-        case alternate
-        case author
-        case dnsPrefetch = "dns-prefetch"
-        case help
-        case icon
-        case license
-        case next
-        case pingback
-        case preconnect
-        case prefetch
-        case preload
-        case prerender
-        case prev
-        case search
-        case stylesheet
-        case shortcutIcon = "shortcut icon"
-        case appleTouchIcon = "apple-touch-icon"
-    }
-
     public var name: String { "link" }
 
     public var attributes: [HTMLAttribute]
@@ -147,17 +151,7 @@ public struct Link: EmptyNode, ReferenceAttribute, ReferenceLanguageAttribute, M
 /// The `<meta />`element
 ///
 ///
-public struct Meta: EmptyNode, ContentAttribute, NameAttribute {
-
-    public enum NameType: String {
-        
-        case applicationName = "application-name"
-        case author
-        case description
-        case generator
-        case keywords
-        case viewport
-    }
+public struct Meta: EmptyNode, ContentAttribute, NameAttribute, PropertyAttribute {
 
     public var name: String { "meta" }
 
@@ -166,10 +160,6 @@ public struct Meta: EmptyNode, ContentAttribute, NameAttribute {
     public init(attributes: [HTMLAttribute] = []) {
         self.attributes = attributes
     }
-
-    public func property(_ property: String) -> Meta {
-        add(.init(attribute: "property", value: property))
-    }
 }
 
 /// The `<style>`element
@@ -181,13 +171,13 @@ public struct Style: ContentNode, TypeAttribute, MediaAttribute {
 
     public var attributes: [HTMLAttribute] = []
 
-    public var content: HTMLContent
+    public var content: String
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(content: () -> String) {
+        self.content = content()
     }
 
-    public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
+    public init(attributes: [HTMLAttribute] = [], content: String = "") {
         self.content = content
         self.attributes = attributes
     }
@@ -204,8 +194,8 @@ public struct Html: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -225,8 +215,8 @@ public struct Body: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -246,8 +236,8 @@ public struct Article: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -267,8 +257,8 @@ public struct Section: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -288,8 +278,8 @@ public struct Navigation: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -309,8 +299,8 @@ public struct Aside: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -330,8 +320,8 @@ public struct Heading1: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -340,14 +330,14 @@ public struct Heading1: ContentNode {
     }
 }
 
-extension Heading1: LocalizableNode {
+extension Heading1: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -362,8 +352,8 @@ public struct Heading2: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -372,14 +362,14 @@ public struct Heading2: ContentNode {
     }
 }
 
-extension Heading2: LocalizableNode {
+extension Heading2: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -394,8 +384,8 @@ public struct Heading3: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -404,14 +394,14 @@ public struct Heading3: ContentNode {
     }
 }
 
-extension Heading3: LocalizableNode {
+extension Heading3: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -426,8 +416,8 @@ public struct Heading4: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -436,14 +426,14 @@ public struct Heading4: ContentNode {
     }
 }
 
-extension Heading4: LocalizableNode {
+extension Heading4: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -458,8 +448,8 @@ public struct Heading5: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -468,14 +458,14 @@ public struct Heading5: ContentNode {
     }
 }
 
-extension Heading5: LocalizableNode {
+extension Heading5: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -490,8 +480,8 @@ public struct Heading6: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -500,14 +490,14 @@ public struct Heading6: ContentNode {
     }
 }
 
-extension Heading6: LocalizableNode {
+extension Heading6: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -522,8 +512,8 @@ public struct HeadingGroup: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -543,8 +533,8 @@ public struct Header: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -564,8 +554,8 @@ public struct Footer: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -585,8 +575,8 @@ public struct Address: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -606,8 +596,8 @@ public struct Paragraph: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -616,14 +606,14 @@ public struct Paragraph: ContentNode {
     }
 }
 
-extension Paragraph: LocalizableNode {
+extension Paragraph: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -652,8 +642,8 @@ public struct PreformattedText: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -673,8 +663,8 @@ public struct Blockquote: ContentNode, CiteAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -683,14 +673,14 @@ public struct Blockquote: ContentNode, CiteAttribute {
     }
 }
 
-extension Blockquote: LocalizableNode {
+extension Blockquote: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -705,8 +695,8 @@ public struct OrderedList: ContentNode, ReversedAttribute, StartAttribute, TypeA
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -726,8 +716,8 @@ public struct UnorderedList: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -747,8 +737,8 @@ public struct ListItem: ContentNode, ValueAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -768,8 +758,8 @@ public struct DescriptionList: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -789,8 +779,8 @@ public struct TermName: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -810,8 +800,8 @@ public struct TermDefinition: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -831,8 +821,8 @@ public struct Figure: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -852,8 +842,8 @@ public struct FigureCaption: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -873,8 +863,8 @@ public struct Main: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -894,8 +884,8 @@ public struct Division: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -909,51 +899,30 @@ public struct Division: ContentNode {
 ///
 public struct Anchor: ContentNode, DownloadAttribute, ReferenceAttribute, ReferenceLanguageAttribute, MediaAttribute, PingAttribute, ReferrerPolicyAttribute, RelationshipAttribute, TargetAttribute, TypeAttribute {
 
-    public enum RelationshipTypes: String {
-
-        case alternate
-        case author
-        case bookmark
-        case external
-        case help
-        case license
-        case next
-        case noFollow = "nofollow"
-        case noReferrer = "noreferrer"
-        case noOpener = "noopener"
-        case prev
-        case search
-        case tag
-    }
-
     public var name: String { "a" }
 
     public var attributes: [HTMLAttribute] = []
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
         self.content = content
         self.attributes = attributes
     }
-
-    public func mail(to email: String) -> Anchor {
-        self.reference("mailto:\(email)")
-    }
 }
 
-extension Anchor: LocalizableNode {
+extension Anchor: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -968,8 +937,8 @@ public struct Emphasize: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -989,8 +958,8 @@ public struct Strong: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1010,8 +979,8 @@ public struct Small: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1020,14 +989,14 @@ public struct Small: ContentNode {
     }
 }
 
-extension Small: LocalizableNode {
+extension Small: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -1042,8 +1011,8 @@ public struct StrikeThrough: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1052,14 +1021,14 @@ public struct StrikeThrough: ContentNode {
     }
 }
 
-extension StrikeThrough: LocalizableNode {
+extension StrikeThrough: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -1074,8 +1043,8 @@ public struct Cite: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1095,8 +1064,8 @@ public struct ShortQuote: ContentNode, CiteAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1116,8 +1085,8 @@ public struct Definition: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1137,8 +1106,8 @@ public struct Abbreviation: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1158,8 +1127,8 @@ public struct Ruby: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1179,8 +1148,8 @@ public struct RubyText: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1200,8 +1169,8 @@ public struct RubyPronunciation: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1221,8 +1190,8 @@ public struct Data: ContentNode, ValueAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1242,8 +1211,8 @@ public struct Time: ContentNode, DateTimeAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1263,8 +1232,8 @@ public struct Code: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1284,8 +1253,8 @@ public struct Variable: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1305,8 +1274,8 @@ public struct SampleOutput: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1326,8 +1295,8 @@ public struct KeyboardInput: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1347,8 +1316,8 @@ public struct Subscript: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1368,8 +1337,8 @@ public struct Superscript: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1389,8 +1358,8 @@ public struct Italic: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1399,14 +1368,14 @@ public struct Italic: ContentNode {
     }
 }
 
-extension Italic: LocalizableNode {
+extension Italic: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -1421,8 +1390,8 @@ public struct Bold: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1431,14 +1400,14 @@ public struct Bold: ContentNode {
     }
 }
 
-extension Bold: LocalizableNode {
+extension Bold: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -1453,8 +1422,8 @@ public struct Underline: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1463,14 +1432,14 @@ public struct Underline: ContentNode {
     }
 }
 
-extension Underline: LocalizableNode {
+extension Underline: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -1485,8 +1454,8 @@ public struct Mark: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1506,8 +1475,8 @@ public struct Bdi: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1541,8 +1510,8 @@ public struct Span: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1590,8 +1559,8 @@ public struct InsertedText: ContentNode, CiteAttribute, DateTimeAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1611,8 +1580,8 @@ public struct DeletedText: ContentNode, CiteAttribute, DateTimeAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1632,8 +1601,8 @@ public struct Picture: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1668,18 +1637,6 @@ public struct Image: EmptyNode, AlternativeAttribute, SourceAttribute, SizesAttr
     public init(attributes: [HTMLAttribute] = []) {
         self.attributes = attributes
     }
-
-    public init(source: String) {
-        self.init(attributes: [.init(attribute: "src", value: source)])
-    }
-
-    public init(source: TemplateValue<String>) {
-        self.init(attributes: [.init(attribute: "src", value: source)])
-    }
-
-    public func alt(_ text: HTMLContent) -> Image {
-        self.add(.init(attribute: "alt", value: text))
-    }
 }
 
 /// The `<iframe>`element
@@ -1687,16 +1644,14 @@ public struct Image: EmptyNode, AlternativeAttribute, SourceAttribute, SizesAttr
 ///
 public struct InlineFrame: ContentNode, SourceAttribute, NameAttribute, WidthAttribute, HeightAttribute, ReferrerPolicyAttribute {
     
-    public typealias NameType = String
-    
     public var name: String { "iframe" }
 
     public var attributes: [HTMLAttribute] = []
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1723,8 +1678,6 @@ public struct Embed: EmptyNode, SourceAttribute, TypeAttribute, WidthAttribute,
 ///
 ///
 public struct Object: ContentNode, DataAttribute, TypeAttribute, NameAttribute, FormAttribute, WidthAttribute, HeightAttribute {
-
-    public typealias NameType = String
     
     public var name: String { "object" }
 
@@ -1732,8 +1685,8 @@ public struct Object: ContentNode, DataAttribute, TypeAttribute, NameAttribute,
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1747,8 +1700,6 @@ public struct Object: ContentNode, DataAttribute, TypeAttribute, NameAttribute,
 ///
 public struct Parameter: EmptyNode, NameAttribute, ValueAttribute {
     
-    public typealias NameType = String
-    
     public var name: String { "param" }
 
     public var attributes: [HTMLAttribute]
@@ -1769,8 +1720,8 @@ public struct Video: ContentNode, SourceAttribute, AutoPlayAttribute, LoopAttrib
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1790,8 +1741,8 @@ public struct Audio: ContentNode, SourceAttribute, AutoPlayAttribute, LoopAttrib
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1818,8 +1769,6 @@ public struct Track: EmptyNode, KindAttribute, SourceAttribute, LabelAttribute,
 ///
 ///
 public struct Map: ContentNode, NameAttribute {
-
-    public typealias NameType = String
     
     public var name: String { "map" }
 
@@ -1827,8 +1776,8 @@ public struct Map: ContentNode, NameAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1841,9 +1790,6 @@ public struct Map: ContentNode, NameAttribute {
 ///
 ///
 public struct Area: ContentNode, AlternativeAttribute, CoordinatesAttribute, ShapeAttribute, ReferenceAttribute, TargetAttribute, DownloadAttribute, PingAttribute, RelationshipAttribute, ReferrerPolicyAttribute {
-    
-    public typealias RelationshipTypes = RelationshipType
-    
 
     public var name: String { "area" }
 
@@ -1851,8 +1797,8 @@ public struct Area: ContentNode, AlternativeAttribute, CoordinatesAttribute, Sha
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1872,8 +1818,8 @@ public struct Table: ContentNode, WidthAttribute, HeightAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1893,8 +1839,8 @@ public struct Caption: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1914,8 +1860,8 @@ public struct ColumnGroup: ContentNode, SpanAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1935,8 +1881,8 @@ public struct Column: ContentNode, SpanAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1956,8 +1902,8 @@ public struct TableBody: ContentNode, WidthAttribute, HeightAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1977,8 +1923,8 @@ public struct TableHead: ContentNode, WidthAttribute, HeightAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -1998,8 +1944,8 @@ public struct TableFoot: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2019,8 +1965,8 @@ public struct TableRow: ContentNode, WidthAttribute, HeightAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2040,8 +1986,8 @@ public struct DataCell: ContentNode, ColumnSpanAttribute, RowSpanAttribute, Head
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2061,8 +2007,8 @@ public struct HeaderCell: ContentNode, ColumnSpanAttribute, RowSpanAttribute, He
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2071,14 +2017,14 @@ public struct HeaderCell: ContentNode, ColumnSpanAttribute, RowSpanAttribute, He
     }
 }
 
-extension HeaderCell: LocalizableNode {
+extension HeaderCell: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -2086,10 +2032,6 @@ extension HeaderCell: LocalizableNode {
 ///
 ///
 public struct Form: ContentNode, ActionAttribute, AutoCompleteAttribute, EncodingAttribute, MethodAttribute, NameAttribute, TargetAttribute, RelationshipAttribute {
-    
-    public typealias RelationshipTypes = RelationshipType
-    
-    public typealias NameType = String
 
     public var name: String { "form" }
 
@@ -2097,8 +2039,8 @@ public struct Form: ContentNode, ActionAttribute, AutoCompleteAttribute, Encodin
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2118,8 +2060,8 @@ public struct Label: ContentNode, ForAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2128,14 +2070,14 @@ public struct Label: ContentNode, ForAttribute {
     }
 }
 
-extension Label: LocalizableNode {
+extension Label: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
@@ -2144,56 +2086,13 @@ extension Label: LocalizableNode {
 ///
 public struct Input: EmptyNode, AcceptAttribute, AlternativeAttribute, AutoCompleteAttribute, CheckedAttribute, DisabledAttribute, FormAttribute, FormActionAttribute, HeightAttribute, ListAttribute, MaximumValueAttribute, MaximumLengthAttribute, MinimumValueAttribute, MinimumLengthAttribute, MultipleAttribute, NameAttribute, PatternAttribute, PlaceholderAttribute, ReadyOnlyAttribute, RequiredAttribute, SizeAttribute, SourceAttribute, StepAttribute, TypeAttribute, ValueAttribute, WidthAttribute {
 
-    public typealias NameType = String
-
-    public enum Types: String {
-        
-        case button
-        case checkbox
-        case color
-        case date
-        case datetimeLocal = "datetime-local"
-        case email
-        case file
-        case hidden
-        case image
-        case month
-        case number
-        case password
-        case radio
-        case range
-        case reset
-        case search
-        case submit
-        case telephone = "tel"
-        case text
-        case time
-        case url
-        case week
-    }
-
     public var name: String { "input" }
 
     public var attributes: [HTMLAttribute]
 
-    public init(type: Types, id: HTMLContent) {
-        self.attributes = [
-            .init(attribute: "type", value: type.rawValue),
-            .init(attribute: "id", value: id)
-        ]
-    }
-
     public init(attributes: [HTMLAttribute] = []) {
         self.attributes = attributes
     }
-
-    public func type(_ type: Types) -> Input {
-        self.type(TemplateValue<String>.constant(type.rawValue))
-    }
-
-    public func isChecked(_ condition: Conditionable) -> Input {
-        self.add(.init(attribute: "checked", value: nil, isIncluded: condition))
-    }
 }
 
 /// The `<button>`element
@@ -2201,45 +2100,37 @@ public struct Input: EmptyNode, AcceptAttribute, AlternativeAttribute, AutoCompl
 ///
 public struct Button: ContentNode, DisabledAttribute, FormAttribute, FormActionAttribute, NameAttribute, TypeAttribute, ValueAttribute {
 
-    public typealias NameType = String
-
     public var name: String { "button" }
 
     public var attributes: [HTMLAttribute] = []
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
         self.content = content
         self.attributes = attributes
     }
-
-    public func type(_ type: ButtonType) -> Button {
-        self.type(TemplateValue<String>.constant(type.rawValue))
-    }
 }
 
-extension Button: LocalizableNode {
+extension Button: Localizable {
     
     public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
+        self.content = Localized(key: localizedKey)
     }
 
     public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
+        self.content = Localized(key: localizedKey, context: context)
     }
 }
 
 /// The `<select>`element
 ///
 ///
-public struct Select: AttributeNode, AutoCompleteAttribute, DisabledAttribute, FormAttribute, MultipleAttribute, NameAttribute, RequiredAttribute, SizeAttribute {
-
-    public typealias NameType = String
+public struct Select: ContentNode, AutoCompleteAttribute, DisabledAttribute, FormAttribute, MultipleAttribute, NameAttribute, RequiredAttribute, SizeAttribute {
 
     public var name: String { "select" }
 
@@ -2247,83 +2138,16 @@ public struct Select: AttributeNode, AutoCompleteAttribute, DisabledAttribute, F
 
     public var content: HTMLContent
 
-    let isMultiple: Conditionable
-
-    public init(attributes: [HTMLAttribute], content: HTMLContent, isMultiple: Conditionable) {
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
+    }
+    
+    public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
         self.content = content
         self.attributes = attributes
-        self.isMultiple = isMultiple
-    }
-
-    public init<B>(_ elements: TemplateValue<[B]>, @HTMLBuilder builder: (TemplateValue<B>) -> HTMLContent) {
-        content = ForEach(in: elements) { variable in
-            Option { builder(variable) }
-        }
-        isMultiple = false
-    }
-
-    public init<B>(custom elements: TemplateValue<[B]>, @HTMLBuilder builder: (TemplateValue<B>) -> HTMLContent) {
-        content = ForEach(in: elements) { variable in
-            builder(variable)
-        }
-        isMultiple = false
     }
 }
 
-extension Select {
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
-        isMultiple = false
-    }
-}
-
-extension Select {
-    public init<B>(_ elements: TemplateValue<[B]>) where B: HTMLContent {
-        isMultiple = false
-        content = ForEach(in: elements) { variable in
-            Option { variable }
-        }
-    }
-}
-
-// Easier use of TemplateVariable.constant()
-extension Select {
-    public init<A>(in elements: A) where A : Sequence, A.Element : HTMLContent {
-        isMultiple = false
-        content = ForEach<A>(in: .constant(elements)) { variable in
-            Option { variable }
-        }
-    }
-}
-
-extension Select {
-    public func copy(with attributes: [HTMLAttribute]) -> Select {
-        .init(attributes: attributes, content: content, isMultiple: isMultiple)
-    }
-
-    public func isMultiple(_ isMultiple: Conditionable) -> Select {
-        .init(attributes: attributes, content: content, isMultiple: isMultiple)
-    }
-
-    public func prerender(_ formula: HTMLRenderer.Formula) throws {
-        formula.add(string: "<\(name)")
-        try attributes.forEach {
-            formula.add(string: " ")
-            try $0.prerender(formula)
-        }
-        let ifView = IF(isMultiple) { " multiple" }
-        try ifView.prerender(formula) // Need to prerender the different paths
-
-        formula.add(mappable: ifView)
-        formula.add(string: ">")
-        try content.prerender(formula)
-        formula.add(string: "</\(name)>")
-    }
-
-    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
-        fatalError()
-    }
-}
 
 /// The `<datalist>`element
 ///
@@ -2336,8 +2160,8 @@ public struct DataList: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2357,8 +2181,8 @@ public struct OptionGroup: ContentNode, DisabledAttribute, LabelAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2376,70 +2200,43 @@ public struct Option: ContentNode, DisabledAttribute, LabelAttribute, ValueAttri
 
     public var attributes: [HTMLAttribute] = []
 
-    public var content: HTMLContent
+    public var content: String
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(content: () -> String) {
+        self.content = content()
     }
 
-    public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
+    public init(attributes: [HTMLAttribute] = [], content: String = "") {
         self.content = content
         self.attributes = attributes
     }
-
-    public func isSelected(_ condition: Conditionable) -> Option {
-        self.add(.init(attribute: "selected", value: nil, isIncluded: condition))
-    }
 }
 
 /// The `<textarea>`element
 ///
 ///
 public struct TextArea: ContentNode, AutoCompleteAttribute, ColumnsAttribute, DisabledAttribute, FormAttribute, MaximumLengthAttribute, MinimumLengthAttribute, NameAttribute, PlaceholderAttribute, ReadyOnlyAttribute, RequiredAttribute, RowsAttribute, WrapAttribute {
-
-    public typealias NameType = String
-
+        
     public var name: String { "textarea" }
 
     public var attributes: [HTMLAttribute] = []
 
-    public var content: HTMLContent
+    public var content: String
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(content: () -> String) {
+        self.content = content()
     }
 
-    public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
+    public init(attributes: [HTMLAttribute] = [], content: String = "") {
         self.content = content
         self.attributes = attributes
     }
-
-    public func row(_ rows: Int) -> TextArea {
-        add(.init(attribute: "row", value: rows))
-    }
-
-    public func readOnly() -> TextArea {
-        add(.init(attribute: "readonly", value: nil))
-    }
-}
-
-extension TextArea: LocalizableNode {
-    
-    public init(_ localizedKey: String) {
-        content = Localized(key: localizedKey)
-    }
-
-    public init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B : Encodable {
-        content = Localized(key: localizedKey, context: context)
-    }
 }
 
 /// The `<output>`element
 ///
 ///
 public struct Output: ContentNode, ForAttribute, FormAttribute, NameAttribute {
-
-    public typealias NameType = String
     
     public var name: String { "output" }
 
@@ -2447,8 +2244,8 @@ public struct Output: ContentNode, ForAttribute, FormAttribute, NameAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2468,8 +2265,8 @@ public struct Progress: ContentNode, ValueAttribute, MaximumValueAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2489,8 +2286,8 @@ public struct Meter: ContentNode, ValueAttribute, MinimumValueAttribute, Maximum
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2503,8 +2300,6 @@ public struct Meter: ContentNode, ValueAttribute, MinimumValueAttribute, Maximum
 ///
 ///
 public struct Fieldset: ContentNode, DisabledAttribute, FormAttribute, NameAttribute {
-
-    public typealias NameType = String
     
     public var name: String { "fieldset" }
 
@@ -2512,8 +2307,8 @@ public struct Fieldset: ContentNode, DisabledAttribute, FormAttribute, NameAttri
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2533,8 +2328,8 @@ public struct Legend: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2554,8 +2349,8 @@ public struct Details: ContentNode, OpenAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2575,8 +2370,8 @@ public struct Summary: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2596,8 +2391,8 @@ public struct Dialog: ContentNode, OpenAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2617,8 +2412,8 @@ public struct Script: ContentNode, AsyncAttribute, ReferrerPolicyAttribute, Sour
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2638,8 +2433,8 @@ public struct NoScript: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2659,8 +2454,8 @@ public struct Template: ContentNode {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
@@ -2680,8 +2475,8 @@ public struct Canvas: ContentNode, WidthAttribute, HeightAttribute {
 
     public var content: HTMLContent
 
-    public init(@HTMLBuilder builder: () -> HTMLContent) {
-        content = builder()
+    public init(@HTMLBuilder content: () -> HTMLContent) {
+        self.content = content()
     }
 
     public init(attributes: [HTMLAttribute] = [], content: HTMLContent = "") {
diff --git a/Sources/HTMLKit/External/Functions.swift b/Sources/HTMLKit/External/Functions.swift
index a0ccb5b6..0a1b6cc5 100644
--- a/Sources/HTMLKit/External/Functions.swift
+++ b/Sources/HTMLKit/External/Functions.swift
@@ -1,3 +1,5 @@
+// MARK: functions
+
 /// A struct making it possible to have a if in the template
 ///
 ///     runtimeIf(\.name == "Name", view: ...)
diff --git a/Sources/HTMLKit/External/Types.swift b/Sources/HTMLKit/External/Types.swift
index 31344acc..848006a9 100644
--- a/Sources/HTMLKit/External/Types.swift
+++ b/Sources/HTMLKit/External/Types.swift
@@ -1,3 +1,5 @@
+// MARK: types
+
 /// The type is for
 ///
 ///
@@ -300,6 +302,7 @@ public enum RelationshipType: String {
     case dnsPrefetch = "dns-prefetch"
     case appleTouchIcon = "apple-touch-icon"
     case appleTouchStartupImage = "apple-touch-startup-image"
+    case shortcutIcon = "shortcut icon"
 }
 
 /// The enum is for
@@ -410,3 +413,17 @@ public enum DocumentType: String {
     case xhtmlFrameset = #"html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd""#
     case xhtml = #"html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd""#
 }
+
+/// The type is for
+///
+///
+public enum OpenGraphType: String {
+
+    case title = "og:title"
+    case image = "og:image"
+    case description = "og:description"
+    case type = "og:type"
+    case url = "og:url"
+    case locale = "og:locale"
+    case siteName = "og:site_name"
+}
diff --git a/Sources/HTMLKit/Internal/Conditions.swift b/Sources/HTMLKit/Internal/Conditions.swift
index dd8c3ed7..475ab43f 100644
--- a/Sources/HTMLKit/Internal/Conditions.swift
+++ b/Sources/HTMLKit/Internal/Conditions.swift
@@ -1,47 +1,10 @@
-protocol IsDefinable {
-    var isDefinded: Bool { get }
-}
-
-/// A protocol that makes a struct to a condition that can be used in an if
-public protocol Conditionable: HTMLContent {
-
-    /// Evaluates an expression with a context
-    ///
-    /// - Parameter context: The context to use when evaluating
-    /// - Returns: true if the expression is correct else false
-    func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool
-}
-
-extension Conditionable {
-
-    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
-        try evaluate(with: manager).render(with: manager)
-    }
-
-    public func prerender(_ formula: HTMLRenderer.Formula) throws {
-        formula.add(mappable: self)
-    }
-}
-
-extension Bool: Conditionable {
-    public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
-        return self
-    }
-}
-
-extension HTMLContext: Conditionable where Value == Bool {
-    public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
-        try manager.value(for: self)
-    }
-}
-
 /// A condition that evaluates an equal expression between a variable and a constant value
+///
+///
 public struct Equal<Value>: Conditionable where Value: Equatable {
 
-    /// The path to the variable
     let path: TemplateValue<Value>
 
-    /// The value to be compared with
     let value: TemplateValue<Value>
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -50,12 +13,12 @@ public struct Equal<Value>: Conditionable where Value: Equatable {
 }
 
 /// A condition that evaluates an not equal expression between a variable and a constant value
+///
+///
 public struct NotEqual<Value>: Conditionable where Value: Equatable {
 
-    /// The path to the variable
     let path: TemplateValue<Value>
 
-    /// The value to be compared with
     let value: Value
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -64,12 +27,12 @@ public struct NotEqual<Value>: Conditionable where Value: Equatable {
 }
 
 /// A condition that evaluates a less then expression between a variable and a constant value
+///
+///
 public struct LessThen<Value>: Conditionable where Value: Comparable {
 
-    /// The path to the variable
     let path: TemplateValue<Value>
 
-    /// The value to be compared with
     let value: Value
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -78,12 +41,12 @@ public struct LessThen<Value>: Conditionable where Value: Comparable {
 }
 
 /// A condition that evaluates a greater then expression between a variable and a constant value
+///
+///
 public struct GreaterThen<Value>: Conditionable where Value: Comparable {
 
-    /// The path to the variable
     let path: TemplateValue<Value>
 
-    /// The value to be compared with
     let value: Value
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -92,6 +55,8 @@ public struct GreaterThen<Value>: Conditionable where Value: Comparable {
 }
 
 /// A condition that evaluates a greater then expression between a variable and a constant value
+///
+///
 public struct Between<Value>: Conditionable where Value: Comparable {
 
     /// The path to the variable
@@ -109,6 +74,7 @@ public struct Between<Value>: Conditionable where Value: Comparable {
 
 /// A condition that is allways true
 /// Used as the `else` condition
+///
 struct AlwaysTrueCondition: Conditionable {
     func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
         return true
@@ -117,6 +83,7 @@ struct AlwaysTrueCondition: Conditionable {
 
 /// A condition that is allways true
 /// Used as the `else` condition
+///
 struct InvertCondition: Conditionable {
 
     let condition: Conditionable
@@ -126,9 +93,11 @@ struct InvertCondition: Conditionable {
     }
 }
 
+/// The struct is for
+///
+///
 struct BoolCondition<Root>: Conditionable {
 
-    /// The path to the variable
     let path: TemplateValue<Bool>
 
     func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -136,12 +105,13 @@ struct BoolCondition<Root>: Conditionable {
     }
 }
 
+/// The struct is for
+///
+///
 public struct NullableEqual<Value>: Conditionable where Value: Equatable {
 
-    /// The path to the variable
     let path: TemplateValue<Value?>
 
-    /// The value to be compared with
     let value: Value
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -150,12 +120,12 @@ public struct NullableEqual<Value>: Conditionable where Value: Equatable {
 }
 
 /// A condition that evaluates an not equal expression between a variable and a constant value
+///
+///
 public struct NullableNotEqual<Value>: Conditionable where Value: Equatable {
 
-    /// The path to the variable
     let path: TemplateValue<Value?>
 
-    /// The value to be compared with
     let value: Value
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -164,12 +134,12 @@ public struct NullableNotEqual<Value>: Conditionable where Value: Equatable {
 }
 
 /// A condition that evaluates a less then expression between a variable and a constant value
+///
+///
 public struct NullableLessThen<Value>: Conditionable where Value: Comparable {
 
-    /// The path to the variable
     let path: TemplateValue<Value?>
 
-    /// The value to be compared with
     let value: Value
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -182,12 +152,12 @@ public struct NullableLessThen<Value>: Conditionable where Value: Comparable {
 }
 
 /// A condition that evaluates a greater then expression between a variable and a constant value
+///
+///
 public struct NullableGreaterThen<Value>: Conditionable where Value: Comparable {
 
-    /// The path to the variable
     let path: TemplateValue<Value?>
 
-    /// The value to be compared with
     let value: Value
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -199,13 +169,13 @@ public struct NullableGreaterThen<Value>: Conditionable where Value: Comparable
     }
 }
 
-// A condition equal to && in swift
+/// The struct is for
+///
+///
 public struct AndCondition: Conditionable {
 
-    /// The first condition
     let first: Conditionable
 
-    /// The second condition
     let second: Conditionable
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -213,13 +183,13 @@ public struct AndCondition: Conditionable {
     }
 }
 
-// A condition equal to || in swift
+/// The struct is for
+///
+///
 public struct OrCondition: Conditionable {
 
-    /// The first condition
     let first: Conditionable
 
-    /// The second condition
     let second: Conditionable
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -228,9 +198,10 @@ public struct OrCondition: Conditionable {
 }
 
 /// A condition that evaluates a greater then expression between a variable and a constant value
+///
+///
 public struct NotNullCondition<Value>: Conditionable {
 
-    /// The path to the variable
     let path: TemplateValue<Value?>
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
@@ -239,13 +210,14 @@ public struct NotNullCondition<Value>: Conditionable {
 }
 
 /// A condition that evaluates a greater then expression between a variable and a constant value
+///
+///
 public struct NotNullConditionGeneral<Value>: Conditionable {
 
-    /// The path to the variable
     let path: TemplateValue<Value>
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
-        if let value = try path.value(from: manager) as? IsDefinable {
+        if let value = try path.value(from: manager) as? Defineable {
             return value.isDefinded
         } else {
             return true
@@ -254,13 +226,14 @@ public struct NotNullConditionGeneral<Value>: Conditionable {
 }
 
 /// A condition that evaluates a greater then expression between a variable and a constant value
+///
+///
 public struct IsNullConditionGeneral<Value>: Conditionable {
 
-    /// The path to the variable
     let path: TemplateValue<Value>
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
-        if let value = try path.value(from: manager) as? IsDefinable {
+        if let value = try path.value(from: manager) as? Defineable {
             return value.isDefinded == false
         } else {
             return false
@@ -268,6 +241,9 @@ public struct IsNullConditionGeneral<Value>: Conditionable {
     }
 }
 
+/// The struct is for
+///
+///
 public struct InCollectionCondition<Value>: Conditionable where Value: Equatable {
 
     let valuePath: TemplateValue<Value>
@@ -285,6 +261,9 @@ public struct InCollectionCondition<Value>: Conditionable where Value: Equatable
     }
 }
 
+/// The struct is for
+///
+///
 public struct InCollectionConditionOptional<Value>: Conditionable where Value: Equatable {
 
     let valuePath: TemplateValue<Value?>
@@ -305,9 +284,10 @@ public struct InCollectionConditionOptional<Value>: Conditionable where Value: E
 }
 
 /// A condition that evaluates a greater then expression between a variable and a constant value
+///
+///
 public struct IsNullCondition<Value>: Conditionable {
 
-    /// The path to the variable
     let path: TemplateValue<Value?>
 
     public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
diff --git a/Sources/HTMLKit/Internal/EnvironmentModifier.swift b/Sources/HTMLKit/Internal/EnvironmentModifier.swift
new file mode 100644
index 00000000..e44c6eb0
--- /dev/null
+++ b/Sources/HTMLKit/Internal/EnvironmentModifier.swift
@@ -0,0 +1,23 @@
+/// The modifier is for
+///
+///
+public struct EnvironmentModifier: HTMLContent {
+
+    let view: HTMLContent
+    let locale: HTMLContent
+
+    let localFormula = HTMLRenderer.Formula()
+
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        try view.prerender(localFormula)
+        formula.add(mappable: self)
+    }
+
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
+        let prevLocale = manager.locale
+        manager.locale = try locale.render(with: manager)
+        let rendering = try localFormula.render(with: manager)
+        manager.locale = prevLocale
+        return rendering
+    }
+}
diff --git a/Sources/HTMLKit/Internal/EscapingOption.swift b/Sources/HTMLKit/Internal/EscapingOption.swift
index 0621ce3e..5a919bce 100644
--- a/Sources/HTMLKit/Internal/EscapingOption.swift
+++ b/Sources/HTMLKit/Internal/EscapingOption.swift
@@ -1,7 +1,6 @@
-/// The different escaping options for a variable
+/// The enum is for
+///
 ///
-/// - unsafeNone: No escaping. This will render the variable as given
-/// - safeHTML: This will escape characters that may cause security problems
 public enum EscapingOption: CustomDebugStringConvertible {
     case unsafeNone
     case safeHTML
diff --git a/Sources/HTMLKit/Internal/Extensions/DataTypes.swift b/Sources/HTMLKit/Internal/Extensions/DataTypes.swift
index 730f36c4..0733074b 100644
--- a/Sources/HTMLKit/Internal/Extensions/DataTypes.swift
+++ b/Sources/HTMLKit/Internal/Extensions/DataTypes.swift
@@ -2,12 +2,10 @@ import Foundation
 
 extension Array: HTMLContent where Element == HTMLContent {
 
-    // View `HTML` documentation
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
         try forEach { try $0.prerender(formula) }
     }
 
-    // View `HTML` documentation
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         return try self.reduce("") { try $0 + $1.render(with: manager) }
     }
@@ -18,6 +16,7 @@ extension Array: HTMLContent where Element == HTMLContent {
 }
 
 extension Array where Element == HTMLAttribute {
+    
     public func add(attribute: HTMLAttribute) -> [HTMLAttribute] {
         var attributes = self
         for (index, attr) in attributes.enumerated() {
@@ -68,18 +67,17 @@ extension Array where Element == HTMLAttribute {
 
 extension String: HTMLContent {
 
-    // View `HTML` documentation
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         return self
     }
 
-    // View `HTML` documentation
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
         formula.add(string: self)
     }
 }
 
 extension String: RawRepresentable {
+    
     public typealias RawValue = String
 
     public var rawValue: String { self }
@@ -91,12 +89,10 @@ extension String: RawRepresentable {
 
 extension Int: HTMLContent {
 
-    // View `HTML` documentation
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         return String(self)
     }
 
-    // View `HTML` documentation
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
         formula.add(string: String(self))
     }
@@ -106,12 +102,10 @@ extension Int: HTMLContent {
 
 extension Double: HTMLContent {
 
-    // View `HTML` documentation
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         return String(self)
     }
 
-    // View `HTML` documentation
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
         formula.add(string: String(self))
     }
@@ -121,12 +115,10 @@ extension Double: HTMLContent {
 
 extension Float: HTMLContent {
 
-    // View `HTML` documentation
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         return String(self)
     }
 
-    // View `HTML` documentation
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
         formula.add(string: String(self))
     }
@@ -136,12 +128,10 @@ extension Float: HTMLContent {
 
 extension Bool: HTMLContent {
 
-    // View `HTML` documentation
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         return String(self)
     }
 
-    // View `HTML` documentation
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
         formula.add(string: String(self))
     }
@@ -149,9 +139,14 @@ extension Bool: HTMLContent {
     public var renderWhenLocalizing: Bool { return false }
 }
 
+extension Bool: Conditionable {
+    public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
+        return self
+    }
+}
+
 extension Optional: HTMLContent where Wrapped: HTMLContent {
 
-    // View `HTML` documentation
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
         switch self {
         case .some(let wrapped): try wrapped.prerender(formula)
@@ -159,7 +154,6 @@ extension Optional: HTMLContent where Wrapped: HTMLContent {
         }
     }
 
-    // View `HTML` documentation
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         switch self {
         case .none: return ""
@@ -175,7 +169,8 @@ extension Optional: HTMLContent where Wrapped: HTMLContent {
     }
 }
 
-extension Optional: IsDefinable {
+extension Optional: Defineable {
+    
     var isDefinded: Bool {
         switch self {
         case .none: return false
@@ -186,12 +181,10 @@ extension Optional: IsDefinable {
 
 extension UUID: HTMLContent {
 
-    // View `HTML` documentation
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         return self.uuidString
     }
 
-    // View `HTML` documentation
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
         formula.add(string: self.uuidString)
     }
diff --git a/Sources/HTMLKit/Internal/Formulas.swift b/Sources/HTMLKit/Internal/Formulas.swift
new file mode 100644
index 00000000..a15516cf
--- /dev/null
+++ b/Sources/HTMLKit/Internal/Formulas.swift
@@ -0,0 +1,68 @@
+/// The protocol defines
+///
+///
+public protocol HTMLTemplate: HTMLContent {
+    
+    associatedtype Context
+    
+    var context: TemplateValue<Context> { get }
+
+    var body: HTMLContent { get }
+}
+
+extension HTMLTemplate {
+    
+    public var context: TemplateValue<Context> { .root() }
+
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
+        try body.render(with: manager)
+    }
+
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        try body.prerender(formula)
+    }
+
+    public var scripts: HTMLContent { body.scripts }
+}
+
+/// The protocol defines
+///
+///
+public protocol HTMLPage: HTMLContent {
+    
+    var body: HTMLContent { get }
+}
+
+extension HTMLPage {
+    
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
+        try body.render(with: manager)
+    }
+
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        try body.prerender(formula)
+    }
+
+    public var scripts: HTMLContent { body.scripts }
+}
+
+/// The protocol defines
+///
+///
+public protocol HTMLComponent: HTMLContent {
+    
+    var body: HTMLContent { get }
+}
+
+extension HTMLComponent {
+    
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
+        try body.render(with: manager)
+    }
+
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        try body.prerender(formula)
+    }
+
+    public var scripts: HTMLContent { body.scripts }
+}
diff --git a/Sources/HTMLKit/Internal/HTMLBuilder.swift b/Sources/HTMLKit/Internal/HTMLBuilder.swift
index 3ef7b917..b0547c26 100644
--- a/Sources/HTMLKit/Internal/HTMLBuilder.swift
+++ b/Sources/HTMLKit/Internal/HTMLBuilder.swift
@@ -1,5 +1,7 @@
-@_functionBuilder
-public class HTMLBuilder {
+/// The builder is for
+///
+///
+@resultBuilder public class HTMLBuilder {
 
     public static func buildBlock(_ children: HTMLContent...) -> HTMLContent {
         return children
diff --git a/Sources/HTMLKit/Internal/HTMLDocument.swift b/Sources/HTMLKit/Internal/HTMLDocument.swift
deleted file mode 100644
index 978b90a4..00000000
--- a/Sources/HTMLKit/Internal/HTMLDocument.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-
-public struct Document: HTMLPage, AttributeNode {
-
-    public enum Types: String {
-        case html5 = "html"
-
-        /// This DTD contains all HTML elements and attributes, but does NOT INCLUDE presentational or deprecated elements (like font). Framesets are not allowed.
-        case html4Strict = #"HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd""#
-
-        /// This DTD contains all HTML elements and attributes, INCLUDING presentational and deprecated elements (like font). Framesets are not allowed.
-        case html4Transitional = #"HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd""#
-
-        /// This DTD is equal to HTML 4.01 Transitional, but allows the use of frameset content.
-        case html4Frameset = #"HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd""#
-
-        /// This DTD contains all HTML elements and attributes, but does NOT INCLUDE presentational or deprecated elements (like font). Framesets are not allowed. The markup must also be written as well-formed XML.
-        case xhtmlStrict = #"html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd""#
-
-        /// This DTD contains all HTML elements and attributes, INCLUDING presentational and deprecated elements (like font). Framesets are not allowed. The markup must also be written as well-formed XML.
-        case xhtmlTransitional = #"html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd""#
-
-        /// This DTD is equal to XHTML 1.0 Transitional, but allows the use of frameset content.
-        case xhtmlFrameset = #"html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd""#
-
-        /// This DTD is equal to XHTML 1.0 Strict, but allows you to add modules (for example to provide Ruby support for East-Asian languages).
-        case xhtml = #"html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd""#
-    }
-
-    let type: Types
-    let content: HTMLContent
-
-    public var attributes: [HTMLAttribute]
-
-    public init(type: Types, @HTMLBuilder content: () -> HTMLContent) {
-        self.type = type
-        self.content = content()
-        self.attributes = []
-    }
-
-    init(type: Types, content: HTMLContent, attributes: [HTMLAttribute]) {
-        self.type = type
-        self.content = content
-        self.attributes = attributes
-    }
-
-    public var body: HTMLContent {
-        [
-            "<!DOCTYPE \(type.rawValue)>",
-            Html { content }.add(attributes: attributes)
-        ]
-    }
-
-    public func copy(with attributes: [HTMLAttribute]) -> Document {
-        Document(type: type, content: content, attributes: attributes)
-    }
-}
diff --git a/Sources/HTMLKit/Internal/HTMLRenderer.swift b/Sources/HTMLKit/Internal/HTMLRenderer.swift
index 5bcddc9b..a49effbd 100644
--- a/Sources/HTMLKit/Internal/HTMLRenderer.swift
+++ b/Sources/HTMLKit/Internal/HTMLRenderer.swift
@@ -1,63 +1,11 @@
-
 import Foundation
 import Lingo
 
-/// A protocol that handles and renders HTMLKit templates
-public protocol HTMLRenderable: class {
-    
-    /// Renders a `HTMLTemplate` formula
-    ///
-    ///     try renderer.render(raw: WelcomeView.self, with: WelcomeView.Context(...))
-    ///
-    /// - Parameters:
-    ///   - type: The view type to render
-    ///   - context: The needed context to render the view with
-    /// - Returns: Returns a rendered view in a raw `String`
-    /// - Throws: If the formula do not exists, or if the rendering process fails
-    func render<T: HTMLTemplate>(raw type: T.Type, with context: T.Context) throws -> String
-
-    /// Renders a `HTMLPage` formula
-    ///
-    ///     try renderer.render(raw: WelcomeView.self)
-    ///
-    /// - Parameter type: The view type to render
-    /// - Returns: Returns a rendered view in a raw `String`
-    /// - Throws: If the formula do not exists, or if the rendering process fails
-    func render<T: HTMLPage>(raw type: T.Type) throws -> String
-    
-    /// Adds a forumla to the renderer
-    ///
-    ///     try renderer.add(view: WelcomeView())
-    ///
-    /// - Parameter view: The view type to add
-    /// - Throws: If the pre-rendering process fails for some reason
-    func add<T: HTMLTemplate>(view: T) throws
-    
-    /// Adds a forumla to the renderer
-    ///
-    ///     try renderer.add(view: WelcomeView())
-    ///
-    /// - Parameter view: The view type to add
-    /// - Throws: If the pre-rendering process fails for some reason
-    func add<T: HTMLPage>(view: T) throws
-    
-    /// Registers a localization directory to the renderer
-    ///
-    ///     try renderer.registerLocalization() // Using default values
-    ///     try renderer.registerLocalization(atPath: "Localization", defaultLocale: "nb")
-    ///
-    /// - Parameters:
-    ///   - path: A relative path to the localization folder. This is by *default* set to "Resource/Localization"
-    ///   - defaultLocale: The default locale to use. This is by *default* set to "en"
-    /// - Throws: If there is an error registrating the lingo
-    func registerLocalization(atPath path: String, defaultLocale: String) throws
-}
-
 /// A struct containing the different formulas for the different views.
 ///
 ///     try renderer.add(template: WelcomeView())           // Builds the formula
 ///     try renderer.render(WelcomeView.self)               // Renders the formula
-public class HTMLRenderer: HTMLRenderable {
+public class HTMLRenderer: Renderable {
 
     static let empty = ContextManager<Void>(rootContext: ())
 
@@ -142,22 +90,6 @@ public class HTMLRenderer: HTMLRenderable {
         formulaCache[ObjectIdentifier(T.self)] = formula
     }
 
-    //    /// Brews a formula for later use
-    //    ///
-    //    ///     try renderer.add(template: WelcomeView.self)
-    //    ///
-    //    /// - Parameter type: The view type to brew
-    //    /// - Throws: If the brewing process fails for some reason
-    //    public mutating func add<T: LocalizedTemplate>(template view: T) throws {
-    //        let formula = Formula(context: T.self, calendar: calendar, timeZone: timeZone)
-    //        formula.localePath = T
-    ////        guard formula.localePath != nil else {
-    ////            throw Localize<T, NoContext>.Errors.missingLocalePath
-    ////        }
-    //        try view.build().prerender(formula)
-    //        formulaCache[String(reflecting: T.self)] = formula
-    //    }
-
     /// Registers a localization directory to the renderer
     ///
     ///     try renderer.registerLocalization() // Using default values
diff --git a/Sources/HTMLKit/Internal/Localize.swift b/Sources/HTMLKit/Internal/Localized.swift
similarity index 50%
rename from Sources/HTMLKit/Internal/Localize.swift
rename to Sources/HTMLKit/Internal/Localized.swift
index 1c5f9173..e42cc4eb 100644
--- a/Sources/HTMLKit/Internal/Localize.swift
+++ b/Sources/HTMLKit/Internal/Localized.swift
@@ -1,27 +1,13 @@
-////
-////  Localize.swift
-////  HTMLKit
-////
-////  Created by Mats Mollestad on 16/04/2019.
-////
-//
-//import Lingo
 import Foundation
-//
-
-public protocol LocalizableNode {
-    init(_ localizedKey: String)
-    init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B: Encodable
-}
-
-extension LocalizableNode {
-    public init<T>(_ localizedKey: String, with context: T) where T: Encodable {
-        self.init(localizedKey, with: TemplateValue<T>.constant(context))
-    }
-}
 
+/// The struct ist for
+///
+///
 public struct NoData: Encodable {}
 
+/// The struct ist for
+///
+///
 public struct Localized<B>: HTMLContent where B: Encodable {
 
     enum Errors: Error {
@@ -65,34 +51,3 @@ extension Localized where B == NoData {
         self.context = nil
     }
 }
-
-public struct EnvironmentModifier: HTMLContent {
-
-    let view: HTMLContent
-    let locale: HTMLContent
-
-    let localFormula = HTMLRenderer.Formula()
-
-    public func prerender(_ formula: HTMLRenderer.Formula) throws {
-        try view.prerender(localFormula)
-        formula.add(mappable: self)
-    }
-
-    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
-        let prevLocale = manager.locale
-        manager.locale = try locale.render(with: manager)
-        let rendering = try localFormula.render(with: manager)
-        manager.locale = prevLocale
-        return rendering
-    }
-}
-
-extension HTMLContent {
-    public func environment(locale: String) -> EnvironmentModifier {
-        return EnvironmentModifier(view: self, locale: locale)
-    }
-
-    public func environment(locale: TemplateValue<String>) -> EnvironmentModifier {
-        return EnvironmentModifier(view: self, locale: locale)
-    }
-}
diff --git a/Sources/HTMLKit/Internal/HTMLAttribute.swift b/Sources/HTMLKit/Internal/Mapping/HTMLAttribute.swift
similarity index 74%
rename from Sources/HTMLKit/Internal/HTMLAttribute.swift
rename to Sources/HTMLKit/Internal/Mapping/HTMLAttribute.swift
index 4f41d91f..63af7eae 100644
--- a/Sources/HTMLKit/Internal/HTMLAttribute.swift
+++ b/Sources/HTMLKit/Internal/Mapping/HTMLAttribute.swift
@@ -1,20 +1,12 @@
-/// An attribute on a node
+/// The struct is for
+///
 ///
-///     HTMLAttributeNode.class("text-dark") // <... class="text-dark"/>
 public struct HTMLAttribute {
 
-    public enum Method: String {
-        case post
-        case get
-    }
-
-    /// The attribute to set
     public let attribute: String
 
-    /// The value of the attribute
     public let value: HTMLContent?
 
-    /// A condition that evaluates if an attributes should be rendered
     public let isIncluded: Conditionable
 
     public init(attribute: String, value: HTMLContent?, isIncluded: Conditionable = true) {
@@ -25,6 +17,7 @@ public struct HTMLAttribute {
 }
 
 extension HTMLAttribute: HTMLContent {
+    
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         try IF(isIncluded) {
             attribute
diff --git a/Sources/HTMLKit/Internal/HTMLContent.swift b/Sources/HTMLKit/Internal/Mapping/HTMLContent.swift
similarity index 53%
rename from Sources/HTMLKit/Internal/HTMLContent.swift
rename to Sources/HTMLKit/Internal/Mapping/HTMLContent.swift
index 9fa9e8db..d580e014 100644
--- a/Sources/HTMLKit/Internal/HTMLContent.swift
+++ b/Sources/HTMLKit/Internal/Mapping/HTMLContent.swift
@@ -1,36 +1,37 @@
 import Foundation
 
+/// The protocol defines
+///
+///
 public protocol HTMLContent {
 
-    /// A value indicating if the template should render when it is used as localization info
     var renderWhenLocalizing: Bool { get }
 
-    /// Renders a compiled template to an HTML document
-    ///
-    /// - Parameter manager: A manager that contains the context
-    /// - Returns: An HTML document
-    /// - Throws: If the HTML can not be rendered for some reason
     func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String
 
-    /// Brews a mappable object in to a formula
-    ///
-    ///     formula.add(string: "<\(name)/>")   // A constant string
-    ///     formula.add(self)                   // Not able to be predetermand
-    ///
-    /// - Parameter formula: The formula to brew in to
-    /// - Throws: If there occured some error
     func prerender(_ formula: HTMLRenderer.Formula) throws
 
-    /// The script needed to render the underlying HTML
     var scripts: HTMLContent { get }
 }
 
 extension HTMLContent {
+    
     public var renderWhenLocalizing: Bool { return true }
+    
     public var scripts: HTMLContent { "" }
+    
+    public func environment(locale: String) -> EnvironmentModifier {
+        return EnvironmentModifier(view: self, locale: locale)
+    }
+
+    public func environment(locale: TemplateValue<String>) -> EnvironmentModifier {
+        return EnvironmentModifier(view: self, locale: locale)
+    }
 }
 
-/// Concats two values
+/// The function is for
+///
+///
 public func + (lhs: HTMLContent, rhs: HTMLContent) -> HTMLContent {
     var output: Array<HTMLContent> = []
 
@@ -48,7 +49,9 @@ public func + (lhs: HTMLContent, rhs: HTMLContent) -> HTMLContent {
     return output
 }
 
-/// Concats second value to the first one
+/// The function is for
+///
+///
 public func +=(lhs: inout HTMLContent, rhs: HTMLContent) {
     lhs = lhs + rhs
 }
diff --git a/Sources/HTMLKit/Internal/Mapping/HTMLContext.swift b/Sources/HTMLKit/Internal/Mapping/HTMLContext.swift
new file mode 100644
index 00000000..da8c1b5e
--- /dev/null
+++ b/Sources/HTMLKit/Internal/Mapping/HTMLContext.swift
@@ -0,0 +1,105 @@
+/// The class is for
+///
+///
+@propertyWrapper @dynamicMemberLookup public class HTMLContext<Value> {
+
+    enum Errors: Error {
+        case unknownKeyPath
+    }
+
+    let pathId: String
+    let rootId: String
+    let escaping: EscapingOption
+    let isMascadingOptional: Bool
+
+    let keyPath: AnyKeyPath
+
+    public var wrappedValue: HTMLContext { self }
+
+    init<Root>(keyPath: KeyPath<Root, Value>, id: String, rootId: String = "", escaping: EscapingOption = .safeHTML, isMascadingOptional: Bool = false) {
+        self.keyPath = keyPath
+        self.pathId = id
+        self.rootId = rootId
+        self.escaping = escaping
+        self.isMascadingOptional = isMascadingOptional
+    }
+
+    init(keyPath: AnyKeyPath, id: String, rootId: String = "", escaping: EscapingOption = .safeHTML, isMascadingOptional: Bool = false) {
+        self.keyPath = keyPath
+        self.pathId = id
+        self.rootId = rootId
+        self.escaping = escaping
+        self.isMascadingOptional = isMascadingOptional
+    }
+
+    public init(_ value: Value.Type) {
+        self.keyPath = \Value.self
+        self.pathId = ""
+        self.rootId = ""
+        self.escaping = .safeHTML
+        self.isMascadingOptional = false
+    }
+
+    public func escaping(_ option: EscapingOption) -> HTMLContext<Value> {
+        .init(keyPath: keyPath, id: pathId, rootId: rootId, escaping: option, isMascadingOptional: isMascadingOptional)
+    }
+
+    public subscript<Subject>(dynamicMember keyPath: KeyPath<Value, Subject>) -> HTMLContext<Subject> {
+        guard let newPath = self.keyPath.appending(path: keyPath) else {
+            fatalError()
+        }
+        return HTMLContext<Subject>(keyPath: newPath, id: pathId + "-" + String(reflecting: Subject.self), rootId: rootId, isMascadingOptional: isMascadingOptional)
+    }
+
+    public static func root(_ type: Value.Type, rootId: String) -> HTMLContext<Value> {
+        .init(keyPath: \Value.self, id: "", rootId: rootId)
+    }
+
+    public func makeOptional() -> HTMLContext<Value?> {
+        .init(keyPath: keyPath, id: pathId, rootId: rootId, escaping: escaping, isMascadingOptional: true)
+    }
+
+    public func unsafeCast<T>(to type: T.Type) -> HTMLContext<T> {
+        .init(keyPath: keyPath, id: pathId, rootId: rootId, escaping: escaping)
+    }
+}
+
+extension HTMLContext: HTMLContent where Value: HTMLContent {
+    
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
+        applyEscaping(
+            try manager.value(for: self)
+                .render(with: manager)
+        )
+    }
+
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        formula.add(mappable: self)
+    }
+
+    func applyEscaping(_ render: String) -> String {
+        switch escaping {
+        case .safeHTML:
+            return render
+                .reduce(into: "") { string, char in
+                    switch char {
+                    case "&":   string += "&amp;"
+                    case "<":   string += "&lt;"
+                    case ">":   string += "&gt;"
+                    case "\"":  string += "&quot;"
+                    case "'":   string += "&#39;"
+                    default:    string += String(char)
+                    }
+                }
+        case .unsafeNone:
+            return render
+        }
+    }
+}
+
+extension HTMLContext: Conditionable where Value == Bool {
+    
+    public func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool {
+        try manager.value(for: self)
+    }
+}
diff --git a/Sources/HTMLKit/Internal/Mapping/HTMLNode.swift b/Sources/HTMLKit/Internal/Mapping/HTMLNode.swift
new file mode 100644
index 00000000..b4feaaa6
--- /dev/null
+++ b/Sources/HTMLKit/Internal/Mapping/HTMLNode.swift
@@ -0,0 +1,89 @@
+/// The protocol defines
+///
+///
+public protocol HTMLNode: HTMLContent, GlobalAttributes {
+    
+    var name: String { get }
+    
+    var attributes: [HTMLAttribute] { get }
+    
+    func add(_ attribute: HTMLAttribute, withSpace: Bool) -> Self
+
+    func add(attributes: [HTMLAttribute], withSpace: Bool) -> Self
+
+    func value(of attribute: String) -> HTMLContent?
+    
+    func copy(with attributes: [HTMLAttribute]) -> Self
+
+    func modify(if condition: Conditionable, modifyer: (Self) -> Self) -> Self
+
+    func wrapAttributes(with condition: Conditionable) -> [HTMLAttribute]
+}
+
+extension HTMLNode {
+
+    public func add(_ attribute: HTMLAttribute, withSpace: Bool = true) -> Self {
+        
+        return copy(with: attributes.add(attribute: attribute))
+    }
+
+    public func add(attributes: [HTMLAttribute], withSpace: Bool = true) -> Self {
+        
+        return self.copy(with: self.attributes.add(attributes: attributes))
+    }
+
+    public func value(of attribute: String) -> HTMLContent? {
+        
+        attributes.first(where: { $0.attribute == attribute })?.value
+    }
+
+    public func modify(if condition: Conditionable, modifyer: (Self) -> Self) -> Self {
+        
+        let emptyNode = self.copy(with: [])
+        let modified = modifyer(emptyNode)
+        return self.add(attributes: modified.wrapAttributes(with: condition))
+    }
+
+    public func modify<Value>(unwrap value: TemplateValue<Value?>, modifyer: (TemplateValue<Value>, Self) -> Self) -> Self {
+        
+        switch value {
+        case .constant(let optional):
+            guard let value = optional else {
+                return self
+            }
+            let emptyNode = self.copy(with: [])
+            let modified = modifyer(.constant(value), emptyNode)
+
+            return self.add(attributes: modified.attributes)
+        case .dynamic(let context):
+            let emptyNode = self.copy(with: [])
+            var modified: Self!
+            if context.isMascadingOptional {
+                modified = modifyer(.dynamic(context.unsafeCast(to: Value.self)), emptyNode)
+            } else {
+                modified = modifyer(.dynamic(context.unsafelyUnwrapped), emptyNode)
+            }
+
+            return self.add(attributes: modified.wrapAttributes(with: context.isDefinded))
+        }
+    }
+
+    public func wrapAttributes(with condition: Conditionable) -> [HTMLAttribute] {
+        
+        attributes.map { attribute in
+            if let value = attribute.value {
+                return HTMLAttribute(
+                    attribute: attribute.attribute,
+                    value: value,
+                    isIncluded: condition
+                )
+            } else {
+                return HTMLAttribute(
+                    attribute: attribute.attribute,
+                    value: nil,
+                    isIncluded: condition
+                )
+            }
+        }
+    }
+}
diff --git a/Sources/HTMLKit/Internal/Nodes.swift b/Sources/HTMLKit/Internal/Nodes.swift
index 14ca0959..4687cf41 100644
--- a/Sources/HTMLKit/Internal/Nodes.swift
+++ b/Sources/HTMLKit/Internal/Nodes.swift
@@ -1,16 +1,34 @@
 /// The node is for
 ///
 ///
-public protocol ContentNode: AttributeNode {
+public protocol ContentNode: HTMLNode {
 
-    var name: String { get }
+    associatedtype Content
+    
+    var content: Content { get }
 
-    var content: HTMLContent { get }
-
-    init(attributes: [HTMLAttribute], content: HTMLContent)
+    init(attributes: [HTMLAttribute], content: Content)
 }
 
-extension ContentNode {
+extension ContentNode where Content == HTMLContent {
+    
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        formula.add(string: "<\(name)")
+        try attributes.forEach {
+            formula.add(string: " ")
+            try $0.prerender(formula)
+        }
+        formula.add(string: ">")
+        try content.prerender(formula)
+        formula.add(string: "</\(name)>")
+    }
+
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
+        try "<\(name)"
+            + attributes.reduce("") { try $0 + " \($1.render(with: manager))" }
+            + ">\(content.render(with: manager))</\(name)>"
+    }
+    
     public func copy(with attributes: [HTMLAttribute]) -> Self {
         .init(attributes: attributes, content: content)
     }
@@ -18,42 +36,48 @@ extension ContentNode {
     public var scripts: HTMLContent { content.scripts }
 }
 
-extension ContentNode {
+extension ContentNode where Content == String {
+    
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        
         formula.add(string: "<\(name)")
+        
         try attributes.forEach {
             formula.add(string: " ")
             try $0.prerender(formula)
         }
+        
         formula.add(string: ">")
+        
         try content.prerender(formula)
+        
         formula.add(string: "</\(name)>")
     }
 
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
+        
         try "<\(name)"
             + attributes.reduce("") { try $0 + " \($1.render(with: manager))" }
             + ">\(content.render(with: manager))</\(name)>"
     }
+    
+    public func copy(with attributes: [HTMLAttribute]) -> Self {
+        .init(attributes: attributes, content: content)
+    }
+    
+    public var scripts: HTMLContent { content.scripts }
 }
 
 /// The node is for
 ///
 ///
-public protocol EmptyNode: AttributeNode {
-
-    var name: String { get }
+public protocol EmptyNode: HTMLNode {
 
     init(attributes: [HTMLAttribute])
 }
 
 extension EmptyNode {
-    public func copy(with attributes: [HTMLAttribute]) -> Self {
-        .init(attributes: attributes)
-    }
-}
-
-extension EmptyNode {
+    
     public func prerender(_ formula: HTMLRenderer.Formula) throws {
         formula.add(string: "<\(name)")
         try attributes.forEach {
@@ -66,92 +90,54 @@ extension EmptyNode {
     public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
         try "<\(name)" + attributes.reduce("") { try $0 + " \($1.render(with: manager))" } + ">"
     }
+    
+    public func copy(with attributes: [HTMLAttribute]) -> Self {
+        .init(attributes: attributes)
+    }
 }
 
 /// The node is for
 ///
 ///
-public protocol AttributeNode: AddableAttributeNode {
-
-    func copy(with attributes: [HTMLAttribute]) -> Self
-
-    func modify(if condition: Conditionable, modifyer: (Self) -> Self) -> Self
-
-    func wrapAttributes(with condition: Conditionable) -> [HTMLAttribute]
+public protocol CommentNode: HTMLContent {
+    
+    associatedtype Content: HTMLContent
+    
+    var content: Content { get }
 }
 
-extension AttributeNode {
-
-    public func add(_ attribute: HTMLAttribute, withSpace: Bool = true) -> Self {
-        return copy(with: attributes.add(attribute: attribute))
-    }
-
-    public func add(attributes: [HTMLAttribute], withSpace: Bool = true) -> Self {
-        return self.copy(with: self.attributes.add(attributes: attributes))
-    }
-
-    public func value(of attribute: String) -> HTMLContent? {
-        attributes.first(where: { $0.attribute == attribute })?.value
-    }
-
-    public func modify(if condition: Conditionable, modifyer: (Self) -> Self) -> Self {
-        let emptyNode = self.copy(with: [])
-        let modified = modifyer(emptyNode)
-        return self.add(attributes: modified.wrapAttributes(with: condition))
+extension CommentNode {
+    
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        
+        formula.add(string: "<!--\(content)-->")
     }
 
-    public func modify<Value>(unwrap value: TemplateValue<Value?>, modifyer: (TemplateValue<Value>, Self) -> Self) -> Self {
-        switch value {
-        case .constant(let optional):
-            guard let value = optional else {
-                return self
-            }
-            let emptyNode = self.copy(with: [])
-            let modified = modifyer(.constant(value), emptyNode)
-
-            return self.add(attributes: modified.attributes)
-        case .dynamic(let context):
-            let emptyNode = self.copy(with: [])
-            var modified: Self!
-            if context.isMascadingOptional {
-                modified = modifyer(.dynamic(context.unsafeCast(to: Value.self)), emptyNode)
-            } else {
-                modified = modifyer(.dynamic(context.unsafelyUnwrapped), emptyNode)
-            }
-
-            return self.add(attributes: modified.wrapAttributes(with: context.isDefinded))
-        }
-    }
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
 
-    public func wrapAttributes(with condition: Conditionable) -> [HTMLAttribute] {
-        attributes.map { attribute in
-            if let value = attribute.value {
-                return HTMLAttribute(
-                    attribute: attribute.attribute,
-                    value: value,
-                    isIncluded: condition
-                )
-            } else {
-                return HTMLAttribute(
-                    attribute: attribute.attribute,
-                    value: nil,
-                    isIncluded: condition
-                )
-            }
-        }
+        return "<!--\(content)-->"
     }
 }
 
 /// The node is for
 ///
 ///
-public protocol AddableAttributeNode: HTMLContent, GlobalAttributes {
-
-    var attributes: [HTMLAttribute] { get }
+public protocol DocumentNode: HTMLContent {
+    
+    associatedtype Content: HTMLContent
+    
+    var content: Content { get }
+}
 
-    func add(_ attribute: HTMLAttribute, withSpace: Bool) -> Self
+extension DocumentNode {
+    
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        
+        formula.add(string: "<!DOCTYPE \(content)>")
+    }
 
-    func add(attributes: [HTMLAttribute], withSpace: Bool) -> Self
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
 
-    func value(of attribute: String) -> HTMLContent?
+        return "<!DOCTYPE \(content)>"
+    }
 }
diff --git a/Sources/HTMLKit/Internal/Properties/Conditionable.swift b/Sources/HTMLKit/Internal/Properties/Conditionable.swift
new file mode 100644
index 00000000..35272702
--- /dev/null
+++ b/Sources/HTMLKit/Internal/Properties/Conditionable.swift
@@ -0,0 +1,18 @@
+/// The protocol defines
+///
+///
+public protocol Conditionable: HTMLContent {
+    
+    func evaluate<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> Bool
+}
+
+extension Conditionable {
+
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
+        try evaluate(with: manager).render(with: manager)
+    }
+
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        formula.add(mappable: self)
+    }
+}
diff --git a/Sources/HTMLKit/Internal/Properties/Defineable.swift b/Sources/HTMLKit/Internal/Properties/Defineable.swift
new file mode 100644
index 00000000..957d325c
--- /dev/null
+++ b/Sources/HTMLKit/Internal/Properties/Defineable.swift
@@ -0,0 +1,7 @@
+/// The protocol defines
+///
+///
+protocol Defineable {
+    
+    var isDefinded: Bool { get }
+}
diff --git a/Sources/HTMLKit/Internal/Properties/Localizable.swift b/Sources/HTMLKit/Internal/Properties/Localizable.swift
new file mode 100644
index 00000000..a639a120
--- /dev/null
+++ b/Sources/HTMLKit/Internal/Properties/Localizable.swift
@@ -0,0 +1,16 @@
+/// The protocol defines
+///
+///
+public protocol Localizable {
+    
+    init(_ localizedKey: String)
+    
+    init<B>(_ localizedKey: String, with context: TemplateValue<B>) where B: Encodable
+}
+
+extension Localizable {
+    
+    public init<T>(_ localizedKey: String, with context: T) where T: Encodable {
+        self.init(localizedKey, with: TemplateValue<T>.constant(context))
+    }
+}
diff --git a/Sources/HTMLKit/Internal/Properties/Renderable.swift b/Sources/HTMLKit/Internal/Properties/Renderable.swift
new file mode 100644
index 00000000..bd097fa2
--- /dev/null
+++ b/Sources/HTMLKit/Internal/Properties/Renderable.swift
@@ -0,0 +1,52 @@
+/// The protocols defines
+///
+///
+public protocol Renderable: AnyObject {
+    
+    /// Renders a `HTMLTemplate` formula
+    ///
+    ///     try renderer.render(raw: WelcomeView.self, with: WelcomeView.Context(...))
+    ///
+    /// - Parameters:
+    ///   - type: The view type to render
+    ///   - context: The needed context to render the view with
+    /// - Returns: Returns a rendered view in a raw `String`
+    /// - Throws: If the formula do not exists, or if the rendering process fails
+    func render<T: HTMLTemplate>(raw type: T.Type, with context: T.Context) throws -> String
+
+    /// Renders a `HTMLPage` formula
+    ///
+    ///     try renderer.render(raw: WelcomeView.self)
+    ///
+    /// - Parameter type: The view type to render
+    /// - Returns: Returns a rendered view in a raw `String`
+    /// - Throws: If the formula do not exists, or if the rendering process fails
+    func render<T: HTMLPage>(raw type: T.Type) throws -> String
+    
+    /// Adds a forumla to the renderer
+    ///
+    ///     try renderer.add(view: WelcomeView())
+    ///
+    /// - Parameter view: The view type to add
+    /// - Throws: If the pre-rendering process fails for some reason
+    func add<T: HTMLTemplate>(view: T) throws
+    
+    /// Adds a forumla to the renderer
+    ///
+    ///     try renderer.add(view: WelcomeView())
+    ///
+    /// - Parameter view: The view type to add
+    /// - Throws: If the pre-rendering process fails for some reason
+    func add<T: HTMLPage>(view: T) throws
+    
+    /// Registers a localization directory to the renderer
+    ///
+    ///     try renderer.registerLocalization() // Using default values
+    ///     try renderer.registerLocalization(atPath: "Localization", defaultLocale: "nb")
+    ///
+    /// - Parameters:
+    ///   - path: A relative path to the localization folder. This is by *default* set to "Resource/Localization"
+    ///   - defaultLocale: The default locale to use. This is by *default* set to "en"
+    /// - Throws: If there is an error registrating the lingo
+    func registerLocalization(atPath path: String, defaultLocale: String) throws
+}
diff --git a/Sources/HTMLKit/Internal/TemplateValueMapping.swift b/Sources/HTMLKit/Internal/TemplateValueMapping.swift
new file mode 100644
index 00000000..bdc6b996
--- /dev/null
+++ b/Sources/HTMLKit/Internal/TemplateValueMapping.swift
@@ -0,0 +1,27 @@
+/// The class is for
+///
+///
+public class TemplateValueMapping<B, C> {
+    let variable: TemplateValue<B>
+    let transform: (B) throws -> C
+
+    init(variable: TemplateValue<B>, transform: @escaping (B) throws -> C) {
+        self.variable = variable
+        self.transform = transform
+    }
+}
+
+extension TemplateValueMapping: HTMLContent where C: HTMLContent {
+
+    public func prerender(_ formula: HTMLRenderer.Formula) throws {
+        switch variable {
+        case .constant(let value): try transform(value).prerender(formula)
+        case .dynamic(_): formula.add(mappable: self)
+        }
+    }
+
+    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
+        let value = try variable.value(from: manager)
+        return try transform(value).render(with: manager)
+    }
+}
diff --git a/Sources/HTMLKit/Internal/Variables/ContextVariable.swift b/Sources/HTMLKit/Internal/Variables/ContextVariable.swift
new file mode 100644
index 00000000..4d2783e0
--- /dev/null
+++ b/Sources/HTMLKit/Internal/Variables/ContextVariable.swift
@@ -0,0 +1,56 @@
+/// The class is for
+///
+///
+@dynamicMemberLookup public class ContextVariable<Root, Value> {
+
+    let pathId: String
+    let rootId: String
+
+    let root: KeyPath<Root, Value>
+
+    let escaping: EscapingOption
+
+    init(value: KeyPath<Root, Value>, id: String, rootId: String = "", escaping: EscapingOption = .safeHTML) {
+        self.root = value
+        self.pathId = id
+        self.rootId = rootId
+        self.escaping = escaping
+    }
+
+    public subscript<Subject>(dynamicMember keyPath: KeyPath<Value, Subject>) -> ContextVariable<Root, Subject> {
+        let newPath = root.appending(path: keyPath)
+        return ContextVariable<Root, Subject>(value: newPath, id: pathId + "-" + String(reflecting: Subject.self), rootId: rootId)
+    }
+
+    public func escaping(_ option: EscapingOption) -> ContextVariable<Root, Value> {
+        .init(value: root, id: pathId, rootId: rootId, escaping: option)
+    }
+
+    func append<V>(_ context: ContextVariable<Value, V>) throws -> ContextVariable<Root, V> {
+        let path = root.appending(path: context.root)
+        return .init(value: path, id: pathId + "-" + context.pathId, rootId: rootId, escaping: escaping)
+    }
+}
+
+extension ContextVariable {
+    public static func root<T>(_ value: T.Type = T.self, rootId: String = "") -> ContextVariable<T, T> {
+        ContextVariable<T, T>(value: \T.self, id: rootId + String(reflecting: T.self), rootId: rootId)
+    }
+}
+
+extension ContextVariable {
+
+    func applyEscaping(_ render: String) -> String {
+        switch escaping {
+        case .safeHTML:
+            return render
+                .replacingOccurrences(of: "&", with: "&amp;")
+                .replacingOccurrences(of: "<", with: "&lt;")
+                .replacingOccurrences(of: ">", with: "&gt;")
+                .replacingOccurrences(of: "\"", with: "&quot;")
+                .replacingOccurrences(of: "'", with: "&#39;")
+        case .unsafeNone:
+            return render
+        }
+    }
+}
diff --git a/Sources/HTMLKit/Internal/Variables/ContextualVariable.swift b/Sources/HTMLKit/Internal/Variables/ContextualVariable.swift
deleted file mode 100644
index 1cc1c4bb..00000000
--- a/Sources/HTMLKit/Internal/Variables/ContextualVariable.swift
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-@propertyWrapper
-@dynamicMemberLookup
-public class HTMLContext<Value> {
-
-    enum Errors: Error {
-        case unknownKeyPath
-    }
-
-    let pathId: String
-    let rootId: String
-    let escaping: EscapingOption
-    let isMascadingOptional: Bool
-
-    let keyPath: AnyKeyPath
-
-    public var wrappedValue: HTMLContext { self }
-
-    init<Root>(keyPath: KeyPath<Root, Value>, id: String, rootId: String = "", escaping: EscapingOption = .safeHTML, isMascadingOptional: Bool = false) {
-        self.keyPath = keyPath
-        self.pathId = id
-        self.rootId = rootId
-        self.escaping = escaping
-        self.isMascadingOptional = isMascadingOptional
-    }
-
-    init(keyPath: AnyKeyPath, id: String, rootId: String = "", escaping: EscapingOption = .safeHTML, isMascadingOptional: Bool = false) {
-        self.keyPath = keyPath
-        self.pathId = id
-        self.rootId = rootId
-        self.escaping = escaping
-        self.isMascadingOptional = isMascadingOptional
-    }
-
-    public init(_ value: Value.Type) {
-        self.keyPath = \Value.self
-        self.pathId = ""
-        self.rootId = ""
-        self.escaping = .safeHTML
-        self.isMascadingOptional = false
-    }
-
-    public func escaping(_ option: EscapingOption) -> HTMLContext<Value> {
-        .init(keyPath: keyPath, id: pathId, rootId: rootId, escaping: option, isMascadingOptional: isMascadingOptional)
-    }
-
-    public subscript<Subject>(dynamicMember keyPath: KeyPath<Value, Subject>) -> HTMLContext<Subject> {
-        guard let newPath = self.keyPath.appending(path: keyPath) else {
-            fatalError()
-        }
-        return HTMLContext<Subject>(keyPath: newPath, id: pathId + "-" + String(reflecting: Subject.self), rootId: rootId, isMascadingOptional: isMascadingOptional)
-    }
-
-    public static func root(_ type: Value.Type, rootId: String) -> HTMLContext<Value> {
-        .init(keyPath: \Value.self, id: "", rootId: rootId)
-    }
-
-    public func makeOptional() -> HTMLContext<Value?> {
-        .init(keyPath: keyPath, id: pathId, rootId: rootId, escaping: escaping, isMascadingOptional: true)
-    }
-
-    public func unsafeCast<T>(to type: T.Type) -> HTMLContext<T> {
-        .init(keyPath: keyPath, id: pathId, rootId: rootId, escaping: escaping)
-    }
-} 
-
-extension HTMLContext: HTMLContent where Value: HTMLContent {
-    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
-        applyEscaping(
-            try manager.value(for: self)
-                .render(with: manager)
-        )
-    }
-
-    public func prerender(_ formula: HTMLRenderer.Formula) throws {
-        formula.add(mappable: self)
-    }
-
-    func applyEscaping(_ render: String) -> String {
-        switch escaping {
-        case .safeHTML:
-            return render
-                .reduce(into: "") { string, char in
-                    switch char {
-                    case "&":   string += "&amp;"
-                    case "<":   string += "&lt;"
-                    case ">":   string += "&gt;"
-                    case "\"":  string += "&quot;"
-                    case "'":   string += "&#39;"
-                    default:    string += String(char)
-                    }
-                }
-        case .unsafeNone:
-            return render
-        }
-    }
-}
-
-@dynamicMemberLookup
-public class ContextVariable<Root, Value> {
-
-    let pathId: String
-    let rootId: String
-
-    let root: KeyPath<Root, Value>
-
-    let escaping: EscapingOption
-
-    init(value: KeyPath<Root, Value>, id: String, rootId: String = "", escaping: EscapingOption = .safeHTML) {
-        self.root = value
-        self.pathId = id
-        self.rootId = rootId
-        self.escaping = escaping
-    }
-
-    public subscript<Subject>(dynamicMember keyPath: KeyPath<Value, Subject>) -> ContextVariable<Root, Subject> {
-        let newPath = root.appending(path: keyPath)
-        return ContextVariable<Root, Subject>(value: newPath, id: pathId + "-" + String(reflecting: Subject.self), rootId: rootId)
-    }
-
-    public func escaping(_ option: EscapingOption) -> ContextVariable<Root, Value> {
-        .init(value: root, id: pathId, rootId: rootId, escaping: option)
-    }
-
-    func append<V>(_ context: ContextVariable<Value, V>) throws -> ContextVariable<Root, V> {
-        let path = root.appending(path: context.root)
-        return .init(value: path, id: pathId + "-" + context.pathId, rootId: rootId, escaping: escaping)
-    }
-
-//    func cast<T>(to: T.Type) -> ContextVariable<Root, T> {
-//        let anyPath: AnyKeyPath = root
-//        switch anyPath {
-//        case let castRoot as KeyPath<Root, T>:
-//            return .init(value: castRoot, id: pathId, rootId: rootId, escaping: escaping)
-//        default:
-//            fatalError("Can not cast value form \(Value.self) to \(T.self).")
-//        }
-//    }
-}
-
-extension ContextVariable {
-    public static func root<T>(_ value: T.Type = T.self, rootId: String = "") -> ContextVariable<T, T> {
-        ContextVariable<T, T>(value: \T.self, id: rootId + String(reflecting: T.self), rootId: rootId)
-    }
-}
-
-extension ContextVariable {
-
-    func applyEscaping(_ render: String) -> String {
-        switch escaping {
-        case .safeHTML:
-            return render
-                .replacingOccurrences(of: "&", with: "&amp;")
-                .replacingOccurrences(of: "<", with: "&lt;")
-                .replacingOccurrences(of: ">", with: "&gt;")
-                .replacingOccurrences(of: "\"", with: "&quot;")
-                .replacingOccurrences(of: "'", with: "&#39;")
-        case .unsafeNone:
-            return render
-        }
-    }
-}
-
-public class TemplateValueMapping<B, C> {
-    let variable: TemplateValue<B>
-    let transform: (B) throws -> C
-
-    init(variable: TemplateValue<B>, transform: @escaping (B) throws -> C) {
-        self.variable = variable
-        self.transform = transform
-    }
-}
-
-extension TemplateValueMapping: HTMLContent where C: HTMLContent {
-
-    public func prerender(_ formula: HTMLRenderer.Formula) throws {
-        switch variable {
-        case .constant(let value): try transform(value).prerender(formula)
-        case .dynamic(_): formula.add(mappable: self)
-        }
-    }
-
-    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
-        let value = try variable.value(from: manager)
-        return try transform(value).render(with: manager)
-    }
-}
-
-@dynamicMemberLookup
-struct StringValue {
-    public subscript<Type: ExpressibleByStringLiteral>(dynamicMember string: Type) -> StringValue {
-        return .init()
-    }
-}
-
-public protocol HTMLPage: HTMLContent {
-    var body: HTMLContent { get }
-}
-
-public typealias HTMLComponent = HTMLPage
-
-extension HTMLPage {
-    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
-        try body.render(with: manager)
-    }
-
-    public func prerender(_ formula: HTMLRenderer.Formula) throws {
-        try body.prerender(formula)
-    }
-
-    public var scripts: HTMLContent { body.scripts }
-}
-
-public protocol HTMLTemplate: HTMLContent {
-    associatedtype Context
-    var context: TemplateValue<Context> { get }
-
-    var body: HTMLContent { get }
-}
-
-extension HTMLTemplate {
-    public var context: TemplateValue<Context> { .root() }
-
-    public func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
-        try body.render(with: manager)
-    }
-
-    public func prerender(_ formula: HTMLRenderer.Formula) throws {
-        try body.prerender(formula)
-    }
-
-    public var scripts: HTMLContent { body.scripts }
-}
diff --git a/Sources/HTMLKit/Internal/Variables/DateVariable.swift b/Sources/HTMLKit/Internal/Variables/DateVariable.swift
index 107ec1dd..e71291a0 100644
--- a/Sources/HTMLKit/Internal/Variables/DateVariable.swift
+++ b/Sources/HTMLKit/Internal/Variables/DateVariable.swift
@@ -1,13 +1,8 @@
-//
-//  DateVariable.swift
-//  HTMLKit
-//
-//  Created by Mats Mollestad on 02/05/2019.
-//
-
 import Foundation
 
 /// A struct that renders a data in a specified format
+///
+///
 struct DateVariable: HTMLContent {
 
     enum Errors: LocalizedError {
@@ -33,12 +28,10 @@ struct DateVariable: HTMLContent {
         }
     }
 
-    /// The key path to the date to render
     let dateReference: Reference
 
     var format: Format
 
-    // View `CompiledTemplate`
     func render<T>(with manager: HTMLRenderer.ContextManager<T>) throws -> String {
 
         var optionalDate: Date?
@@ -52,7 +45,6 @@ struct DateVariable: HTMLContent {
         let formatter = DateFormatter()
 
         if let locale = manager.locale {
-            // settign locale before the format in order to bypass Linux bug
             formatter.locale = .init(identifier: locale)
         }
         switch format {
@@ -65,7 +57,6 @@ struct DateVariable: HTMLContent {
         return formatter.string(from: date)
     }
 
-    // View `CompiledTemplate`
     func prerender(_ formula: HTMLRenderer.Formula) throws {
         formula.add(mappable: self)
     }
@@ -84,16 +75,6 @@ extension TemplateValue where Value == Date {
         return DateVariable(dateReference: .solid(self), format: .style(.init(dateStyle: date, timeStyle: time)))
     }
 
-//    /// Render a date in a formate
-//    ///
-//    /// - Parameters:
-//    ///   - datePath: The path to the date
-//    ///   - formatter: The DateFormatter to use when rendering the string
-//    /// - Returns: A `CompiledTemplate`
-//    public func formating(with formatter: DateFormatter) -> HTML {
-//        return DateVariable(formatter: formatter, dateReference: .solid(self))
-//    }
-
     /// Render a date in a formate
     ///
     /// - Parameters:
@@ -118,16 +99,6 @@ extension TemplateValue where Value == Date? {
         return DateVariable(dateReference: .optional(self), format: .style(.init(dateStyle: date, timeStyle: time)))
     }
 
-//    /// Render a date in a format
-//    ///
-//    /// - Parameters:
-//    ///   - datePath: The path to the date
-//    ///   - formatter: The DateFormatter to use when rendering the string
-//    /// - Returns: A `CompiledTemplate`
-//    public func formating(with formatter: DateFormatter) -> HTML {
-//        return DateVariable(formatter: formatter, dateReference: .optional(self))
-//    }
-
     /// Render a date in a formate
     ///
     /// - Parameters:
diff --git a/Sources/HTMLKit/Internal/Variables/StringValue.swift b/Sources/HTMLKit/Internal/Variables/StringValue.swift
new file mode 100644
index 00000000..fa030394
--- /dev/null
+++ b/Sources/HTMLKit/Internal/Variables/StringValue.swift
@@ -0,0 +1,9 @@
+/// The struct is for
+///
+///
+@dynamicMemberLookup struct StringValue {
+    
+    public subscript<Type: ExpressibleByStringLiteral>(dynamicMember string: Type) -> StringValue {
+        return .init()
+    }
+}
diff --git a/Sources/HTMLKit/Internal/Variables/TemplateValue.swift b/Sources/HTMLKit/Internal/Variables/TemplateValue.swift
index ef9d4e46..08142743 100644
--- a/Sources/HTMLKit/Internal/Variables/TemplateValue.swift
+++ b/Sources/HTMLKit/Internal/Variables/TemplateValue.swift
@@ -1,9 +1,9 @@
-
 import Foundation
 
-@propertyWrapper
-@dynamicMemberLookup
-public enum TemplateValue<Value> {
+/// The enum is for
+///
+///
+@propertyWrapper @dynamicMemberLookup public enum TemplateValue<Value> {
     case constant(Value)
     case dynamic(HTMLContext<Value>)
 
@@ -58,18 +58,13 @@ public enum TemplateValue<Value> {
         case .dynamic(let variable): return .dynamic(variable.unsafeCast(to: T.self))
         }
     }
-
-    /// This is used to determine if the value pretends it is a optional
+    
     var isMasqueradingOptional: Bool {
         switch self {
         case .constant: return false
         case .dynamic(let variable): return variable.isMascadingOptional
         }
     }
-
-//    public func map<T>(transform: @escaping (Value) throws -> T) -> TemplateValueMapping<Value, T> {
-//        TemplateValueMapping(variable: self, transform: transform)
-//    }
 }
 
 extension TemplateValue: HTMLContent where Value: HTMLContent {
diff --git a/Tests/HTMLKitTests/PerformanceTests.swift b/Tests/HTMLKitTests/PerformanceTests.swift
index 3a15220a..f9c520e5 100644
--- a/Tests/HTMLKitTests/PerformanceTests.swift
+++ b/Tests/HTMLKitTests/PerformanceTests.swift
@@ -73,13 +73,80 @@ final class PerformanceTests: XCTestCase {
             _ = try! renderer.render(raw: TestPage.self)
         }
     }
+    
+    func testPerformanceWithAttributes() throws {
+        
+        let view = TestPage {
+            Html {
+                Body {
+                    Header {
+                        Heading1 {
+                            "Performance Test"
+                        }
+                        .id("test")
+                        .class("class")
+                        .role("role")
+                    }
+                    Main {
+                        Article {
+                            Heading3 {
+                                "Test"
+                            }
+                            .id("test")
+                            .class("class")
+                            .role("role")
+                        }
+                    }
+                    .id("test")
+                    .class("class")
+                    .role("role")
+                }
+            }
+        }
+        
+        try renderer.add(view: view)
+        
+        measure {
+            _ = try! renderer.render(raw: TestPage.self)
+        }
+    }
+    
+    func testPerformanceWithoutAttributes() throws {
+        
+        let view = TestPage {
+            Html {
+                Body {
+                    Header {
+                        Heading1 {
+                            "Performance Test"
+                        }
+                    }
+                    Main {
+                        Article {
+                            Heading3 {
+                                "Test"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        try renderer.add(view: view)
+        
+        measure {
+            _ = try! renderer.render(raw: TestPage.self)
+        }
+    }
 }
 
 extension PerformanceTests {
     
     static var allTests = [
         ("testPerformanceRenderingWhenUsingDefault", testPerformanceRenderingWhenUsingDefault),
-        ("testPerformanceRenderingWhenUsingTypealiases", testPerformanceRenderingWhenUsingTypealiases)
+        ("testPerformanceRenderingWhenUsingTypealiases", testPerformanceRenderingWhenUsingTypealiases),
+        ("testPerformanceWithAttributes", testPerformanceWithAttributes),
+        ("testPerformanceWithoutAttributes", testPerformanceWithoutAttributes)
     ]
 }
 
diff --git a/Tests/HTMLKitTests/RenderingTests.swift b/Tests/HTMLKitTests/RenderingTests.swift
index ffa031bb..daca3184 100644
--- a/Tests/HTMLKitTests/RenderingTests.swift
+++ b/Tests/HTMLKitTests/RenderingTests.swift
@@ -18,6 +18,32 @@ final class RenderingTests: XCTestCase {
     
     var renderer = HTMLRenderer()
     
+    func testRenderingDocument() throws {
+        
+        let view = TestPage {
+            Document(type: .html5)
+            Html {
+                Body {
+                    Paragraph {
+                        "text"
+                    }
+                }
+            }
+        }
+        
+        try renderer.add(view: view)
+        
+        XCTAssertEqual(try renderer.render(raw: TestPage.self),
+                       """
+                       <!DOCTYPE html>\
+                       <html>\
+                       <body>\
+                       <p>text</p>\
+                       </body>\
+                       </html>
+                       """
+        )
+    }
     
     func testRenderingContentTag() throws {
         
@@ -55,6 +81,22 @@ final class RenderingTests: XCTestCase {
         )
     }
     
+    func testRenderingCommentTag() throws {
+        
+        let view = TestPage {
+            Comment("text")
+        }
+        
+        try renderer.add(view: view)
+        
+        XCTAssertEqual(try renderer.render(raw: TestPage.self),
+                       """
+                       <!--text-->
+                       """
+        )
+        
+    }
+    
     func testRenderingAttributes() throws {
         
         let view = TestPage {
@@ -63,7 +105,7 @@ final class RenderingTests: XCTestCase {
             }
             .role("role")
             .class("class")
-        }
+        } 
         
         try renderer.add(view: view)
         
@@ -74,6 +116,45 @@ final class RenderingTests: XCTestCase {
         )
     }
     
+    
+    func testRenderingAttributesWithUnterscore() throws {
+        
+        let view = TestPage {
+            Paragraph {
+                "text"
+            }
+            .role("ro_le")
+            .class("cl_ass")
+        }
+        
+        try renderer.add(view: view)
+        
+        XCTAssertEqual(try renderer.render(raw: TestPage.self),
+                       """
+                       <p role="ro_le" class="cl_ass">text</p>
+                       """
+        )
+    }
+    
+    func testRenderingAttributesWithHyphens() throws {
+        
+        let view = TestPage {
+            Paragraph {
+                "text"
+            }
+            .role("ro-le")
+            .class("cl-ass")
+        }
+        
+        try renderer.add(view: view)
+        
+        XCTAssertEqual(try renderer.render(raw: TestPage.self),
+                       """
+                       <p role="ro-le" class="cl-ass">text</p>
+                       """
+        )
+    }
+    
     func testNesting() throws {
         
         let view = TestPage {
@@ -118,9 +199,13 @@ final class RenderingTests: XCTestCase {
 extension RenderingTests {
     
     static var allTests = [
+        ("testRenderingDocument", testRenderingDocument),
         ("testRenderingContentTag", testRenderingContentTag),
         ("testRenderingEmptyTag", testRenderingEmptyTag),
+        ("testRenderingCommentTag", testRenderingCommentTag),
         ("testRenderingAttributes", testRenderingAttributes),
+        ("testRenderingAttributesWithUnterscore", testRenderingAttributesWithUnterscore),
+        ("testRenderingAttributesWithHyphens", testRenderingAttributesWithHyphens),
         ("testNesting", testNesting),
         ("testEscaping", testEscaping)
     ]