From 92b55c633c9f4f31b1f0ea0e6d35ee3db7538214 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 2 Jan 2023 12:07:48 -0500
Subject: [PATCH 001/141] Tag subclasses can customize html name

---
 Sources/SwiftHtml/Tags/Comment.swift |  6 +++---
 Sources/SwiftRss/LastBuildDate.swift |  6 ++----
 Sources/SwiftRss/PubDate.swift       |  4 +---
 Sources/SwiftSgml/EmptyTag.swift     |  6 ++----
 Sources/SwiftSgml/GroupTag.swift     |  6 +++---
 Sources/SwiftSgml/Tag.swift          | 25 ++++++++++++++-----------
 6 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Comment.swift b/Sources/SwiftHtml/Tags/Comment.swift
index f6c00bd..21be1ab 100644
--- a/Sources/SwiftHtml/Tags/Comment.swift
+++ b/Sources/SwiftHtml/Tags/Comment.swift
@@ -14,9 +14,9 @@
 /// This is especially useful if you have a lot of code.
 open class Comment: Tag {
 
-    open override class func createNode() -> Node {
-        Node(type: .comment)
-    }
+    open class override var name: String? { nil }
+
+    open class override var type: Node.NodeType { .comment }
     
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftRss/LastBuildDate.swift b/Sources/SwiftRss/LastBuildDate.swift
index ab35883..c5eb9e2 100644
--- a/Sources/SwiftRss/LastBuildDate.swift
+++ b/Sources/SwiftRss/LastBuildDate.swift
@@ -7,8 +7,6 @@
 
 
 open class LastBuildDate: Tag {
-
-    open override class func createNode() -> Node {
-        Node(type: .standard, name: "lastBuildDate")
-    }
+    
+    open class override var name: String? { "lastBuildDate" }
 }
diff --git a/Sources/SwiftRss/PubDate.swift b/Sources/SwiftRss/PubDate.swift
index 872905c..d826191 100644
--- a/Sources/SwiftRss/PubDate.swift
+++ b/Sources/SwiftRss/PubDate.swift
@@ -7,7 +7,5 @@
 
 open class PubDate: Tag {
     
-    open override class func createNode() -> Node {
-        Node(type: .standard, name: "pubDate")
-    }
+    open class override var name: String? { "pubDate" }    
 }
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index 2083a29..cea900b 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -6,11 +6,9 @@
 //
 
 open class EmptyTag: Tag {
-    
-    open override class func createNode() -> Node {
-        Node(type: .empty, name: String(describing: self).lowercased())
-    }
 
+    open class override var type: Node.NodeType { .empty }
+    
     public init() {
         super.init()
     }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index 41f3b36..9bc6b78 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -7,8 +7,8 @@
 
 
 open class GroupTag: Tag {
+    
+    open class override var name: String? { nil }
 
-    open override class func createNode() -> Node {
-        .init(type: .group)
-    }
+    open class override var type: Node.NodeType { .group }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 7464a64..4efaed0 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -11,25 +11,29 @@ open class Tag {
     public private(set) var children: [Tag]
     
     // MARK: - init
+    
+    open class var name: String? { String(describing: self).lowercased() }
+    
+    open class var type: Node.NodeType { .standard }
 
-    open class func createNode() -> Node {
-        Node(type: .standard, name: String(describing: self).lowercased())
+    open class func createNode(_ type: Node.NodeType, _ name: String?) -> Node {
+        Node(type: type, name: name)
     }
 
     /// initialize a new Tag with child tags
-    public init(_ children: [Tag] = []) {
-        self.node = Self.createNode()
+    public init(name: String? = nil, type: Node.NodeType? = nil, _ children: [Tag] = []) {
+        self.node = Self.createNode(type ?? Self.type, name ?? Self.name)
         self.children = children
     }
 
     /// initialize a new Tag with a single child tag
-    public convenience init(_ child: Tag) {
-        self.init([child])
+    public convenience init(name: String? = nil, type: Node.NodeType? = nil, _ child: Tag) {
+        self.init(name: name, type: type, [child])
     }
 
     /// initialize a new Tag with children using a builder
-    public convenience init(@TagBuilder _ builder: () -> [Tag]) {
-        self.init(builder())
+    public convenience init(name: String? = nil, type: Node.NodeType? = nil, @TagBuilder _ builder: () -> [Tag]) {
+        self.init(name: name, type: type, builder())
     }
    
 //    /// initialize a new Tag with children using an async throwing builder
@@ -37,10 +41,9 @@ open class Tag {
 //        self.init(try await builder())
 //    }
 
-
     /// initialize a new Tag with some contents
-    public convenience init(_ contents: String?) {
-        self.init()
+    public convenience init(name: String? = nil, type: Node.NodeType? = nil, _ contents: String?) {
+        self.init(name: name, type: type)
         if let contents = contents {
             setContents(contents)
         }

From e0d330ca8b6e34d5a90f771db22b2e8c005d1c2f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 2 Jan 2023 12:49:34 -0500
Subject: [PATCH 002/141] name lowercased()

---
 Sources/SwiftSgml/Tag.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 4efaed0..36a1b81 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -12,7 +12,7 @@ open class Tag {
     
     // MARK: - init
     
-    open class var name: String? { String(describing: self).lowercased() }
+    open class var name: String? { String(describing: self) }
     
     open class var type: Node.NodeType { .standard }
 
@@ -22,7 +22,8 @@ open class Tag {
 
     /// initialize a new Tag with child tags
     public init(name: String? = nil, type: Node.NodeType? = nil, _ children: [Tag] = []) {
-        self.node = Self.createNode(type ?? Self.type, name ?? Self.name)
+        let name = name ?? Self.name
+        self.node = Self.createNode(type ?? Self.type, name?.lowercased())
         self.children = children
     }
 

From afcbf3e83e87f72e655e7774cd3350b89d9bb46b Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 4 Jan 2023 15:10:32 -0500
Subject: [PATCH 003/141] Need to make rawValue public so any Tag can set the
 attribute

---
 Sources/SwiftHtml/Attributes/Target.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/SwiftHtml/Attributes/Target.swift b/Sources/SwiftHtml/Attributes/Target.swift
index b02493d..558d8b7 100644
--- a/Sources/SwiftHtml/Attributes/Target.swift
+++ b/Sources/SwiftHtml/Attributes/Target.swift
@@ -28,7 +28,7 @@ public enum TargetFrame {
     /// Opens the linked document in the named iframe
     case frame(String)
     
-    var rawValue: String {
+    public var rawValue: String {
         switch self {
         case .blank:
             return "_blank"

From 6344acef0190c61c38618db7a86a9c300b3d6f7e Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 14 Feb 2023 10:29:39 -0500
Subject: [PATCH 004/141] Class name var

---
 Sources/SwiftHtml/Tags/H6.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Sources/SwiftHtml/Tags/H6.swift b/Sources/SwiftHtml/Tags/H6.swift
index a15b271..735a345 100644
--- a/Sources/SwiftHtml/Tags/H6.swift
+++ b/Sources/SwiftHtml/Tags/H6.swift
@@ -12,5 +12,6 @@
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H6: Tag {
-
+    
+    open class override var name: String? { "h6" }
 }

From 480e2fbce5d3dd5204dc596fef859ba8471f615b Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 14 Feb 2023 10:47:49 -0500
Subject: [PATCH 005/141] Class names for all tags

---
 Sources/SwiftHtml/Tags/A.swift          | 1 +
 Sources/SwiftHtml/Tags/Abbr.swift       | 1 +
 Sources/SwiftHtml/Tags/Address.swift    | 1 +
 Sources/SwiftHtml/Tags/Area.swift       | 1 +
 Sources/SwiftHtml/Tags/Article.swift    | 1 +
 Sources/SwiftHtml/Tags/Aside.swift      | 1 +
 Sources/SwiftHtml/Tags/Audio.swift      | 1 +
 Sources/SwiftHtml/Tags/B.swift          | 1 +
 Sources/SwiftHtml/Tags/Base.swift       | 2 +-
 Sources/SwiftHtml/Tags/Bdi.swift        | 1 +
 Sources/SwiftHtml/Tags/Bdo.swift        | 2 ++
 Sources/SwiftHtml/Tags/Blockquote.swift | 1 +
 Sources/SwiftHtml/Tags/Body.swift       | 1 +
 Sources/SwiftHtml/Tags/Br.swift         | 2 +-
 Sources/SwiftHtml/Tags/Button.swift     | 1 +
 Sources/SwiftHtml/Tags/Canvas.swift     | 1 +
 Sources/SwiftHtml/Tags/Caption.swift    | 1 +
 Sources/SwiftHtml/Tags/Cite.swift       | 1 +
 Sources/SwiftHtml/Tags/Code.swift       | 1 +
 Sources/SwiftHtml/Tags/Col.swift        | 1 +
 Sources/SwiftHtml/Tags/Colgroup.swift   | 1 +
 Sources/SwiftHtml/Tags/Data.swift       | 3 ++-
 Sources/SwiftHtml/Tags/Datalist.swift   | 1 +
 Sources/SwiftHtml/Tags/Dd.swift         | 1 +
 Sources/SwiftHtml/Tags/Del.swift        | 1 +
 Sources/SwiftHtml/Tags/Details.swift    | 1 +
 Sources/SwiftHtml/Tags/Dfn.swift        | 1 +
 Sources/SwiftHtml/Tags/Dialog.swift     | 1 +
 Sources/SwiftHtml/Tags/Div.swift        | 1 +
 Sources/SwiftHtml/Tags/Dl.swift         | 1 +
 Sources/SwiftHtml/Tags/Dt.swift         | 1 +
 Sources/SwiftHtml/Tags/Em.swift         | 1 +
 Sources/SwiftHtml/Tags/Embed.swift      | 1 +
 Sources/SwiftHtml/Tags/Fieldset.swift   | 1 +
 Sources/SwiftHtml/Tags/Figcaption.swift | 1 +
 Sources/SwiftHtml/Tags/Figure.swift     | 1 +
 Sources/SwiftHtml/Tags/Footer.swift     | 1 +
 Sources/SwiftHtml/Tags/Form.swift       | 1 +
 Sources/SwiftHtml/Tags/H1.swift         | 1 +
 Sources/SwiftHtml/Tags/H2.swift         | 1 +
 Sources/SwiftHtml/Tags/H3.swift         | 1 +
 Sources/SwiftHtml/Tags/H4.swift         | 1 +
 Sources/SwiftHtml/Tags/H5.swift         | 1 +
 Sources/SwiftHtml/Tags/Head.swift       | 1 +
 Sources/SwiftHtml/Tags/Header.swift     | 1 +
 Sources/SwiftHtml/Tags/Hr.swift         | 1 +
 Sources/SwiftHtml/Tags/Html.swift       | 1 +
 Sources/SwiftHtml/Tags/I.swift          | 1 +
 Sources/SwiftHtml/Tags/Iframe.swift     | 1 +
 Sources/SwiftHtml/Tags/Img.swift        | 2 ++
 Sources/SwiftHtml/Tags/Input.swift      | 1 +
 Sources/SwiftHtml/Tags/Ins.swift        | 1 +
 Sources/SwiftHtml/Tags/Kbd.swift        | 1 +
 Sources/SwiftHtml/Tags/Label.swift      | 1 +
 Sources/SwiftHtml/Tags/Legend.swift     | 1 +
 Sources/SwiftHtml/Tags/Li.swift         | 1 +
 Sources/SwiftHtml/Tags/Link.swift       | 2 ++
 Sources/SwiftHtml/Tags/MainTag.swift    | 1 +
 Sources/SwiftHtml/Tags/Map.swift        | 2 ++
 Sources/SwiftHtml/Tags/Mark.swift       | 1 +
 Sources/SwiftHtml/Tags/Meta.swift       | 1 +
 Sources/SwiftHtml/Tags/Meter.swift      | 1 +
 Sources/SwiftHtml/Tags/Nav.swift        | 1 +
 Sources/SwiftHtml/Tags/Noscript.swift   | 1 +
 Sources/SwiftHtml/Tags/Object.swift     | 1 +
 Sources/SwiftHtml/Tags/Ol.swift         | 1 +
 Sources/SwiftHtml/Tags/Optgroup.swift   | 1 +
 Sources/SwiftHtml/Tags/Option.swift     | 1 +
 Sources/SwiftHtml/Tags/Output.swift     | 1 +
 Sources/SwiftHtml/Tags/P.swift          | 1 +
 Sources/SwiftHtml/Tags/Param.swift      | 1 +
 Sources/SwiftHtml/Tags/Picture.swift    | 1 +
 Sources/SwiftHtml/Tags/Pre.swift        | 1 +
 Sources/SwiftHtml/Tags/Progress.swift   | 1 +
 Sources/SwiftHtml/Tags/Q.swift          | 2 +-
 Sources/SwiftHtml/Tags/Rp.swift         | 3 ++-
 Sources/SwiftHtml/Tags/Rt.swift         | 1 +
 Sources/SwiftHtml/Tags/Ruby.swift       | 1 +
 Sources/SwiftHtml/Tags/S.swift          | 1 +
 Sources/SwiftHtml/Tags/Samp.swift       | 1 +
 Sources/SwiftHtml/Tags/Script.swift     | 2 ++
 Sources/SwiftHtml/Tags/Section.swift    | 1 +
 Sources/SwiftHtml/Tags/Select.swift     | 1 +
 Sources/SwiftHtml/Tags/Small.swift      | 1 +
 Sources/SwiftHtml/Tags/Source.swift     | 1 +
 Sources/SwiftHtml/Tags/Span.swift       | 1 +
 Sources/SwiftHtml/Tags/Strong.swift     | 1 +
 Sources/SwiftHtml/Tags/Style.swift      | 1 +
 Sources/SwiftHtml/Tags/Sub.swift        | 1 +
 Sources/SwiftHtml/Tags/Summary.swift    | 1 +
 Sources/SwiftHtml/Tags/Sup.swift        | 1 +
 Sources/SwiftHtml/Tags/Table.swift      | 1 +
 Sources/SwiftHtml/Tags/Tbody.swift      | 1 +
 Sources/SwiftHtml/Tags/Td.swift         | 1 +
 Sources/SwiftHtml/Tags/Template.swift   | 1 +
 Sources/SwiftHtml/Tags/Textarea.swift   | 1 +
 Sources/SwiftHtml/Tags/Tfoot.swift      | 1 +
 Sources/SwiftHtml/Tags/Th.swift         | 1 +
 Sources/SwiftHtml/Tags/Thead.swift      | 1 +
 Sources/SwiftHtml/Tags/Time.swift       | 1 +
 Sources/SwiftHtml/Tags/Title.swift      | 1 +
 Sources/SwiftHtml/Tags/Tr.swift         | 1 +
 Sources/SwiftHtml/Tags/Track.swift      | 2 ++
 Sources/SwiftHtml/Tags/U.swift          | 1 +
 Sources/SwiftHtml/Tags/Ul.swift         | 1 +
 Sources/SwiftHtml/Tags/Var.swift        | 1 +
 Sources/SwiftHtml/Tags/Video.swift      | 1 +
 Sources/SwiftHtml/Tags/Wbr.swift        | 1 +
 108 files changed, 116 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index 0a342fd..a5eb06b 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -16,6 +16,7 @@
 /// - An active link is underlined and red
 open class A: Tag {
 
+    open class override var name: String? { "a" }
 }
 
 public extension A {
diff --git a/Sources/SwiftHtml/Tags/Abbr.swift b/Sources/SwiftHtml/Tags/Abbr.swift
index bbc38fc..adba283 100644
--- a/Sources/SwiftHtml/Tags/Abbr.swift
+++ b/Sources/SwiftHtml/Tags/Abbr.swift
@@ -10,5 +10,6 @@
 /// **Tip:** Use the global title attribute to show the description for the abbreviation/acronym when you mouse over the element.
 open class Abbr: Tag {
 
+    open class override var name: String? { "abbr" }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Address.swift b/Sources/SwiftHtml/Tags/Address.swift
index 4d3fe25..426957a 100644
--- a/Sources/SwiftHtml/Tags/Address.swift
+++ b/Sources/SwiftHtml/Tags/Address.swift
@@ -12,4 +12,5 @@
 /// The text in the `<address>` element usually renders in italic, and browsers will always add a line break before and after the `<address>` element.
 open class Address: Tag {
 
+    open class override var name: String? { "address" }
 }
diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index 0ce5ca8..46f76ab 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -51,6 +51,7 @@ open class Area: EmptyTag {
         case poly
     }
 
+    open class override var name: String? { "area" }
 }
 
 public extension Area {
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index b78d593..4f7ebaa 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -26,5 +26,6 @@ public extension Node {
 /// However, you can use CSS to style the `<article>` element (see example below).
 open class Article: Tag {
 
+    open class override var name: String? { "article" }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Aside.swift b/Sources/SwiftHtml/Tags/Aside.swift
index 93b1ab9..e3afcce 100644
--- a/Sources/SwiftHtml/Tags/Aside.swift
+++ b/Sources/SwiftHtml/Tags/Aside.swift
@@ -15,5 +15,6 @@
 /// However, you can use CSS to style the `<aside>` element (see example below).
 open class Aside: Tag {
     
+    open class override var name: String? { "aside" }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Audio.swift b/Sources/SwiftHtml/Tags/Audio.swift
index 0254738..e508efd 100644
--- a/Sources/SwiftHtml/Tags/Audio.swift
+++ b/Sources/SwiftHtml/Tags/Audio.swift
@@ -23,6 +23,7 @@
 ///      *From Edge 79
 open class Audio: Tag {
     
+    open class override var name: String? { "audio" }
 }
 
 public extension Audio {
diff --git a/Sources/SwiftHtml/Tags/B.swift b/Sources/SwiftHtml/Tags/B.swift
index a0fbd69..65f7e45 100644
--- a/Sources/SwiftHtml/Tags/B.swift
+++ b/Sources/SwiftHtml/Tags/B.swift
@@ -8,4 +8,5 @@
 /// Make some text bold (without marking it as important)
 open class B: Tag {
     
+    open class override var name: String? { "b" }
 }
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index 6f8cd80..0e63b10 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -12,7 +12,7 @@
 /// There can only be one single `<base>` element in a document, and it must be inside the `<head>` element.
 open class Base: EmptyTag {
 
-
+    open class override var name: String? { "base" }
 }
 
 public extension Base {
diff --git a/Sources/SwiftHtml/Tags/Bdi.swift b/Sources/SwiftHtml/Tags/Bdi.swift
index b5462e7..27dac2e 100644
--- a/Sources/SwiftHtml/Tags/Bdi.swift
+++ b/Sources/SwiftHtml/Tags/Bdi.swift
@@ -12,4 +12,5 @@
 /// This element is useful when embedding user-generated content with an unknown text direction.
 open class Bdi: Tag {
     
+    open class override var name: String? { "bdi" }
 }
diff --git a/Sources/SwiftHtml/Tags/Bdo.swift b/Sources/SwiftHtml/Tags/Bdo.swift
index 23dccdb..158201d 100644
--- a/Sources/SwiftHtml/Tags/Bdo.swift
+++ b/Sources/SwiftHtml/Tags/Bdo.swift
@@ -9,6 +9,8 @@
 ///
 /// The `<bdo>` tag is used to override the current text direction.
 open class Bdo: Tag {
+    
+    open class override var name: String? { "bdo" }
 
     public init(_ contents: String, dir: TextDirection = .ltr) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Blockquote.swift b/Sources/SwiftHtml/Tags/Blockquote.swift
index c091d58..c22c4a6 100644
--- a/Sources/SwiftHtml/Tags/Blockquote.swift
+++ b/Sources/SwiftHtml/Tags/Blockquote.swift
@@ -10,6 +10,7 @@
 /// Browsers usually indent `<blockquote>` elements (look at example below to see how to remove the indentation).
 open class Blockquote: Tag {
 
+    open class override var name: String? { "blockquote" }
 }
 
 public extension Blockquote {
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 63217f8..1e7ed14 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -12,4 +12,5 @@
 /// **Note:** There can only be one `<body>` element in an HTML document.
 open class Body: Tag {
 
+    open class override var name: String? { "body" }
 }
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index 4883367..a6a0b21 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -12,5 +12,5 @@
 /// The `<br>` tag is an empty tag which means that it has no end tag.
 open class Br: EmptyTag {
     
-    
+    open class override var name: String? { "br" }
 }
diff --git a/Sources/SwiftHtml/Tags/Button.swift b/Sources/SwiftHtml/Tags/Button.swift
index f16c406..3dbff9c 100644
--- a/Sources/SwiftHtml/Tags/Button.swift
+++ b/Sources/SwiftHtml/Tags/Button.swift
@@ -14,6 +14,7 @@
 /// **Tip:** You can easily style buttons with CSS! Look at the examples below or visit our CSS Buttons tutorial.
 open class Button: Tag {
     
+    open class override var name: String? { "button" }
 }
 
 public extension Button {
diff --git a/Sources/SwiftHtml/Tags/Canvas.swift b/Sources/SwiftHtml/Tags/Canvas.swift
index 9bf2246..ea54b32 100644
--- a/Sources/SwiftHtml/Tags/Canvas.swift
+++ b/Sources/SwiftHtml/Tags/Canvas.swift
@@ -12,6 +12,7 @@
 /// Any text inside the `<canvas>` element will be displayed in browsers with JavaScript disabled and in browsers that do not support <canvas>.
 open class Canvas: Tag {
     
+    open class override var name: String? { "canvas" }
 }
 
 public extension Canvas {
diff --git a/Sources/SwiftHtml/Tags/Caption.swift b/Sources/SwiftHtml/Tags/Caption.swift
index 5ffa733..cd30036 100644
--- a/Sources/SwiftHtml/Tags/Caption.swift
+++ b/Sources/SwiftHtml/Tags/Caption.swift
@@ -12,4 +12,5 @@
 /// **Tip:** By default, a table caption will be center-aligned above a table. However, the CSS properties text-align and caption-side can be used to align and place the caption.
 open class Caption: Tag {
 
+    open class override var name: String? { "caption" }
 }
diff --git a/Sources/SwiftHtml/Tags/Cite.swift b/Sources/SwiftHtml/Tags/Cite.swift
index 8e339c9..05a78e5 100644
--- a/Sources/SwiftHtml/Tags/Cite.swift
+++ b/Sources/SwiftHtml/Tags/Cite.swift
@@ -12,4 +12,5 @@
 /// The text in the `<cite>` element usually renders in italic.
 open class Cite: Tag {
     
+    open class override var name: String? { "cite" }
 }
diff --git a/Sources/SwiftHtml/Tags/Code.swift b/Sources/SwiftHtml/Tags/Code.swift
index acb69ce..1efcbc7 100644
--- a/Sources/SwiftHtml/Tags/Code.swift
+++ b/Sources/SwiftHtml/Tags/Code.swift
@@ -16,4 +16,5 @@
 /// - `<pre>`    Defines preformatted text
 open class Code: Tag {
 
+    open class override var name: String? { "code" }
 }
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index 5d29277..a00e813 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -10,6 +10,7 @@
 /// The `<col>` tag is useful for applying styles to entire columns, instead of repeating the styles for each cell, for each row.
 open class Col: EmptyTag {
     
+    open class override var name: String? { "col" }
 }
 
 public extension Col {
diff --git a/Sources/SwiftHtml/Tags/Colgroup.swift b/Sources/SwiftHtml/Tags/Colgroup.swift
index 284ba37..d826858 100644
--- a/Sources/SwiftHtml/Tags/Colgroup.swift
+++ b/Sources/SwiftHtml/Tags/Colgroup.swift
@@ -14,6 +14,7 @@
 /// **Tip:** To define different properties to a column within a `<colgroup>`, use the `<col>` tag within the `<colgroup>` tag.
 open class Colgroup: Tag {
 
+    open class override var name: String? { "colgroup" }
 }
 
 public extension Colgroup {
diff --git a/Sources/SwiftHtml/Tags/Data.swift b/Sources/SwiftHtml/Tags/Data.swift
index 40ae330..28dd893 100644
--- a/Sources/SwiftHtml/Tags/Data.swift
+++ b/Sources/SwiftHtml/Tags/Data.swift
@@ -11,7 +11,8 @@
 ///
 /// **Tip:** If the content is time- or date-related, use the `<time>` element instead.
 open class Data: Tag {
-        
+    
+    open class override var name: String? { "data" }
 }
 
 public extension Data {
diff --git a/Sources/SwiftHtml/Tags/Datalist.swift b/Sources/SwiftHtml/Tags/Datalist.swift
index 91c1b81..2f33403 100644
--- a/Sources/SwiftHtml/Tags/Datalist.swift
+++ b/Sources/SwiftHtml/Tags/Datalist.swift
@@ -12,4 +12,5 @@
 /// The `<datalist>` element's id attribute must be equal to the `<input>` element's list attribute (this binds them together).
 open class Datalist: Tag {
  
+    open class override var name: String? { "datalist" }
 }
diff --git a/Sources/SwiftHtml/Tags/Dd.swift b/Sources/SwiftHtml/Tags/Dd.swift
index e4c4edd..b647eae 100644
--- a/Sources/SwiftHtml/Tags/Dd.swift
+++ b/Sources/SwiftHtml/Tags/Dd.swift
@@ -12,4 +12,5 @@
 /// Inside a `<dd>` tag you can put paragraphs, line breaks, images, links, lists, etc.
 open class Dd: Tag {
 
+    open class override var name: String? { "dd" }
 }
diff --git a/Sources/SwiftHtml/Tags/Del.swift b/Sources/SwiftHtml/Tags/Del.swift
index c3555a0..3b3706c 100644
--- a/Sources/SwiftHtml/Tags/Del.swift
+++ b/Sources/SwiftHtml/Tags/Del.swift
@@ -10,6 +10,7 @@
 /// Browsers will usually strike a line through deleted text.
 open class Del: Tag {
     
+    open class override var name: String? { "del" }
 }
 
 public extension Del {
diff --git a/Sources/SwiftHtml/Tags/Details.swift b/Sources/SwiftHtml/Tags/Details.swift
index bd1eebd..0bbf71e 100644
--- a/Sources/SwiftHtml/Tags/Details.swift
+++ b/Sources/SwiftHtml/Tags/Details.swift
@@ -14,6 +14,7 @@
 /// **Tip:** The `<summary>` tag is used in conjuction with `<details>` to specify a visible heading for the details.
 open class Details: Tag {
 
+    open class override var name: String? { "details" }
 }
 
 public extension Details {
diff --git a/Sources/SwiftHtml/Tags/Dfn.swift b/Sources/SwiftHtml/Tags/Dfn.swift
index 0432541..f7df07b 100644
--- a/Sources/SwiftHtml/Tags/Dfn.swift
+++ b/Sources/SwiftHtml/Tags/Dfn.swift
@@ -13,4 +13,5 @@
 /// `<p><dfn>HTML</dfn> is the standard markup language for creating web pages.</p>`
 open class Dfn: Tag {
     
+    open class override var name: String? { "dfn" }
 }
diff --git a/Sources/SwiftHtml/Tags/Dialog.swift b/Sources/SwiftHtml/Tags/Dialog.swift
index bf9ea95..a3183bd 100644
--- a/Sources/SwiftHtml/Tags/Dialog.swift
+++ b/Sources/SwiftHtml/Tags/Dialog.swift
@@ -10,6 +10,7 @@
 /// The `<dialog>` element makes it easy to create popup dialogs and modals on a web page.
 open class Dialog: Tag {
     
+    open class override var name: String? { "dialog" }
 }
 
 public extension Dialog {
diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index 765238d..84f91a0 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -16,6 +16,7 @@
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
 open class Div: Tag {
 
+    open class override var name: String? { "div" }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Dl.swift b/Sources/SwiftHtml/Tags/Dl.swift
index befb68f..4e56052 100644
--- a/Sources/SwiftHtml/Tags/Dl.swift
+++ b/Sources/SwiftHtml/Tags/Dl.swift
@@ -10,4 +10,5 @@
 /// The `<dl>` tag is used in conjunction with `<dt>` (defines terms/names) and `<dd>` (describes each term/name).
 open class Dl: Tag {
 
+    open class override var name: String? { "dl" }
 }
diff --git a/Sources/SwiftHtml/Tags/Dt.swift b/Sources/SwiftHtml/Tags/Dt.swift
index 793b1cc..4bfe582 100644
--- a/Sources/SwiftHtml/Tags/Dt.swift
+++ b/Sources/SwiftHtml/Tags/Dt.swift
@@ -10,4 +10,5 @@
 /// The `<dt>` tag is used in conjunction with `<dl>` (defines a description list) and `<dd>` (describes each term/name).
 open class Dt: Tag {
     
+    open class override var name: String? { "dt" }
 }
diff --git a/Sources/SwiftHtml/Tags/Em.swift b/Sources/SwiftHtml/Tags/Em.swift
index ffb8da3..655125e 100644
--- a/Sources/SwiftHtml/Tags/Em.swift
+++ b/Sources/SwiftHtml/Tags/Em.swift
@@ -10,4 +10,5 @@
 /// A screen reader will pronounce the words in `<em>` with an emphasis, using verbal stress.
 open class Em: Tag {
 
+    open class override var name: String? { "em" }
 }
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index e96b60d..6fbebb5 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -8,6 +8,7 @@
 /// The `<embed>` tag defines a container for an external resource, such as a web page, a picture, a media player, or a plug-in application.
 open class Embed: EmptyTag {
 
+    open class override var name: String? { "embed" }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Fieldset.swift b/Sources/SwiftHtml/Tags/Fieldset.swift
index 3b5ce6b..a055492 100644
--- a/Sources/SwiftHtml/Tags/Fieldset.swift
+++ b/Sources/SwiftHtml/Tags/Fieldset.swift
@@ -10,6 +10,7 @@
 /// The `<fieldset>` tag draws a box around the related elements.
 open class Fieldset: Tag {
     
+    open class override var name: String? { "fieldset" }
 }
 
 public extension Fieldset {
diff --git a/Sources/SwiftHtml/Tags/Figcaption.swift b/Sources/SwiftHtml/Tags/Figcaption.swift
index 294df3b..4109e2b 100644
--- a/Sources/SwiftHtml/Tags/Figcaption.swift
+++ b/Sources/SwiftHtml/Tags/Figcaption.swift
@@ -10,4 +10,5 @@
 /// The `<figcaption>` element can be placed as the first or last child of the `<figure>` element.
 open class Figcaption: Tag {
     
+    open class override var name: String? { "figcaption" }
 }
diff --git a/Sources/SwiftHtml/Tags/Figure.swift b/Sources/SwiftHtml/Tags/Figure.swift
index 1ceea75..552ceef 100644
--- a/Sources/SwiftHtml/Tags/Figure.swift
+++ b/Sources/SwiftHtml/Tags/Figure.swift
@@ -12,5 +12,6 @@
 /// **Tip:** The `<figcaption>` element is used to add a caption for the `<figure>` element.
 open class Figure: Tag {
 
+    open class override var name: String? { "figure" }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Footer.swift b/Sources/SwiftHtml/Tags/Footer.swift
index ff37077..7e89cfc 100644
--- a/Sources/SwiftHtml/Tags/Footer.swift
+++ b/Sources/SwiftHtml/Tags/Footer.swift
@@ -18,4 +18,5 @@
 /// You can have several `<footer>` elements in one document.
 open class Footer: Tag {
     
+    open class override var name: String? { "footer" }
 }
diff --git a/Sources/SwiftHtml/Tags/Form.swift b/Sources/SwiftHtml/Tags/Form.swift
index eccce02..e3f8631 100644
--- a/Sources/SwiftHtml/Tags/Form.swift
+++ b/Sources/SwiftHtml/Tags/Form.swift
@@ -20,6 +20,7 @@
 /// - `<output>`
 open class Form: Tag {
 
+    open class override var name: String? { "form" }
 }
 
 public extension Form {
diff --git a/Sources/SwiftHtml/Tags/H1.swift b/Sources/SwiftHtml/Tags/H1.swift
index 2cb49d3..466cdf4 100644
--- a/Sources/SwiftHtml/Tags/H1.swift
+++ b/Sources/SwiftHtml/Tags/H1.swift
@@ -13,4 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H1: Tag {
 
+    open class override var name: String? { "h1" }
 }
diff --git a/Sources/SwiftHtml/Tags/H2.swift b/Sources/SwiftHtml/Tags/H2.swift
index c3bd4ad..a63fe7f 100644
--- a/Sources/SwiftHtml/Tags/H2.swift
+++ b/Sources/SwiftHtml/Tags/H2.swift
@@ -13,4 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H2: Tag {
     
+    open class override var name: String? { "h2" }
 }
diff --git a/Sources/SwiftHtml/Tags/H3.swift b/Sources/SwiftHtml/Tags/H3.swift
index b88bd76..5fae7f2 100644
--- a/Sources/SwiftHtml/Tags/H3.swift
+++ b/Sources/SwiftHtml/Tags/H3.swift
@@ -13,4 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H3: Tag {
 
+    open class override var name: String? { "h3" }
 }
diff --git a/Sources/SwiftHtml/Tags/H4.swift b/Sources/SwiftHtml/Tags/H4.swift
index d97f980..1df8582 100644
--- a/Sources/SwiftHtml/Tags/H4.swift
+++ b/Sources/SwiftHtml/Tags/H4.swift
@@ -13,4 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H4: Tag {
     
+    open class override var name: String? { "h4" }
 }
diff --git a/Sources/SwiftHtml/Tags/H5.swift b/Sources/SwiftHtml/Tags/H5.swift
index e337bab..ddc7fc3 100644
--- a/Sources/SwiftHtml/Tags/H5.swift
+++ b/Sources/SwiftHtml/Tags/H5.swift
@@ -13,4 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H5: Tag {
     
+    open class override var name: String? { "h5" }
 }
diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index e6d5ffb..31114de 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -22,4 +22,5 @@
 /// - `<noscript>`
 open class Head: Tag {
 
+    open class override var name: String? { "head" }
 }
diff --git a/Sources/SwiftHtml/Tags/Header.swift b/Sources/SwiftHtml/Tags/Header.swift
index c05a7e4..484e01e 100644
--- a/Sources/SwiftHtml/Tags/Header.swift
+++ b/Sources/SwiftHtml/Tags/Header.swift
@@ -15,5 +15,6 @@
 /// **Note:** You can have several` <header>` elements in one HTML document. However,` <header>` cannot be placed within a` <footer>`,` <address>` or another` <header>` element.
 open class Header: Tag {
     
+    open class override var name: String? { "header" }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index c5ef3a2..bb71b95 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -10,4 +10,5 @@
 /// The `<hr>` element is most often displayed as a horizontal rule that is used to separate content (or define a change) in an HTML page.
 open class Hr: EmptyTag {
     
+    open class override var name: String? { "hr" }
 }
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index e4b8eec..4214539 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -12,6 +12,7 @@
 /// **Note:** You should always include the lang attribute inside the `<html>` tag, to declare the language of the Web page. This is meant to assist search engines and browsers.
 open class Html: Tag {
 
+    open class override var name: String? { "html" }
 }
 
 public extension Html {
diff --git a/Sources/SwiftHtml/Tags/I.swift b/Sources/SwiftHtml/Tags/I.swift
index f4e6505..9406992 100644
--- a/Sources/SwiftHtml/Tags/I.swift
+++ b/Sources/SwiftHtml/Tags/I.swift
@@ -18,4 +18,5 @@
 /// - `<dfn>` (a definition term)
 open class I: Tag {
     
+    open class override var name: String? { "i" }
 }
diff --git a/Sources/SwiftHtml/Tags/Iframe.swift b/Sources/SwiftHtml/Tags/Iframe.swift
index 44f7225..9e954ff 100644
--- a/Sources/SwiftHtml/Tags/Iframe.swift
+++ b/Sources/SwiftHtml/Tags/Iframe.swift
@@ -14,6 +14,7 @@
 /// **Tip:** It is a good practice to always include a title attribute for the `<iframe>`. This is used by screen readers to read out what the content of the `<iframe>` is.
 open class Iframe: Tag {
 
+    open class override var name: String? { "iframe" }
 }
 
 public extension Iframe {
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index c89579f..271f61d 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -19,6 +19,8 @@
 ///
 /// **Tip:** To link an image to another document, simply nest the `<img>` tag inside an `<a>` tag (see example below).
 open class Img: EmptyTag {
+    
+    open class override var name: String? { "img" }
 
     public init(src: String, alt: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index 968aad9..8642ee4 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -12,6 +12,7 @@
 /// The `<input>` element can be displayed in several ways, depending on the type attribute.
 open class Input: EmptyTag {
 
+    open class override var name: String? { "input" }
 }
 
 public extension Input {
diff --git a/Sources/SwiftHtml/Tags/Ins.swift b/Sources/SwiftHtml/Tags/Ins.swift
index 9e71aee..54a55c5 100644
--- a/Sources/SwiftHtml/Tags/Ins.swift
+++ b/Sources/SwiftHtml/Tags/Ins.swift
@@ -10,4 +10,5 @@
 /// **Tip:** Also look at the `<del>` tag to markup deleted text.
 open class Ins: Tag {
     
+    open class override var name: String? { "ins" }
 }
diff --git a/Sources/SwiftHtml/Tags/Kbd.swift b/Sources/SwiftHtml/Tags/Kbd.swift
index b4feaaf..5eac4c0 100644
--- a/Sources/SwiftHtml/Tags/Kbd.swift
+++ b/Sources/SwiftHtml/Tags/Kbd.swift
@@ -10,4 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS (see example below).
 open class Kbd: Tag {
     
+    open class override var name: String? { "kbd" }
 }
diff --git a/Sources/SwiftHtml/Tags/Label.swift b/Sources/SwiftHtml/Tags/Label.swift
index 33c3c3a..f9f6619 100644
--- a/Sources/SwiftHtml/Tags/Label.swift
+++ b/Sources/SwiftHtml/Tags/Label.swift
@@ -35,6 +35,7 @@
 /// Users who have difficulty clicking on very small regions (such as checkboxes) - because when a user clicks the text within the `<label>` element, it toggles the input (this increases the hit area).
 open class Label: Tag {
 
+    open class override var name: String? { "label" }
 }
 
 public extension Label {
diff --git a/Sources/SwiftHtml/Tags/Legend.swift b/Sources/SwiftHtml/Tags/Legend.swift
index 6418b8a..727d50b 100644
--- a/Sources/SwiftHtml/Tags/Legend.swift
+++ b/Sources/SwiftHtml/Tags/Legend.swift
@@ -8,4 +8,5 @@
 /// The `<legend>` tag defines a caption for the `<fieldset>` element.
 open class Legend: Tag {
 
+    open class override var name: String? { "legend" }
 }
diff --git a/Sources/SwiftHtml/Tags/Li.swift b/Sources/SwiftHtml/Tags/Li.swift
index 82e187b..ded078d 100644
--- a/Sources/SwiftHtml/Tags/Li.swift
+++ b/Sources/SwiftHtml/Tags/Li.swift
@@ -16,6 +16,7 @@
 /// **Tip:** Use CSS to style lists.
 open class Li: Tag {
     
+    open class override var name: String? { "li" }
 }
 
 public extension Li {
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index ff8821b..1fe172e 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -11,6 +11,8 @@
 /// 
 /// The `<link>` element is an empty element, it contains attributes only.
 open class Link: EmptyTag {
+    
+    open class override var name: String? { "link" }
 
     public init(rel: Rel) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/MainTag.swift b/Sources/SwiftHtml/Tags/MainTag.swift
index 5878f0e..359ba21 100644
--- a/Sources/SwiftHtml/Tags/MainTag.swift
+++ b/Sources/SwiftHtml/Tags/MainTag.swift
@@ -12,6 +12,7 @@
 /// **Note:** There must not be more than one `<main>` element in a document. The `<main>` element must NOT be a descendant of an `<article>`, `<aside>`, `<footer>`, `<header>`, or `<nav>` element.
 open class Main: Tag {
     
+    open class override var name: String? { "main" }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index 9de4d12..84651c1 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -11,6 +11,8 @@
 ///
 /// The `<map>` element contains a number of `<area>` elements, that defines the clickable areas in the image map.
 open class Map: Tag {
+    
+    open class override var name: String? { "map" }
 
     public init(name: String, @TagBuilder _ builder: () -> [Tag]) {
         super.init(builder())
diff --git a/Sources/SwiftHtml/Tags/Mark.swift b/Sources/SwiftHtml/Tags/Mark.swift
index 51f5b4a..5c1d8af 100644
--- a/Sources/SwiftHtml/Tags/Mark.swift
+++ b/Sources/SwiftHtml/Tags/Mark.swift
@@ -8,4 +8,5 @@
 /// The `<mark>` tag defines text that should be marked or highlighted.
 open class Mark: Tag {
     
+    open class override var name: String? { "mark" }
 }
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index 087774f..c9b2c4a 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -16,6 +16,7 @@
 /// There is a method to let web designers take control over the viewport (the user's visible area of a web page), through the `<meta>` tag (See "Setting The Viewport" example below).
 open class Meta: EmptyTag {
 
+    open class override var name: String? { "meta" }
 }
 
 public extension Meta {
diff --git a/Sources/SwiftHtml/Tags/Meter.swift b/Sources/SwiftHtml/Tags/Meter.swift
index cbe61f3..1248b10 100644
--- a/Sources/SwiftHtml/Tags/Meter.swift
+++ b/Sources/SwiftHtml/Tags/Meter.swift
@@ -14,6 +14,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Meter: Tag {
 
+    open class override var name: String? { "meter" }
     
     public init(value: Int, _ contents: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Nav.swift b/Sources/SwiftHtml/Tags/Nav.swift
index f83e52a..4d0dbe5 100644
--- a/Sources/SwiftHtml/Tags/Nav.swift
+++ b/Sources/SwiftHtml/Tags/Nav.swift
@@ -12,6 +12,7 @@
 /// Browsers, such as screen readers for disabled users, can use this element to determine whether to omit the initial rendering of this content.
 open class Nav: Tag {
 
+    open class override var name: String? { "nav" }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Noscript.swift b/Sources/SwiftHtml/Tags/Noscript.swift
index 87f5069..1a71b93 100644
--- a/Sources/SwiftHtml/Tags/Noscript.swift
+++ b/Sources/SwiftHtml/Tags/Noscript.swift
@@ -10,4 +10,5 @@
 /// The `<noscript>` element can be used in both `<head>` and `<body>`. When used inside `<head>`, the `<noscript>` element could only contain `<link>`, `<style>`, and `<meta>` elements.
 open class Noscript: Tag {
 
+    open class override var name: String? { "noscript" }
 }
diff --git a/Sources/SwiftHtml/Tags/Object.swift b/Sources/SwiftHtml/Tags/Object.swift
index 6019c84..96ebcef 100644
--- a/Sources/SwiftHtml/Tags/Object.swift
+++ b/Sources/SwiftHtml/Tags/Object.swift
@@ -10,6 +10,7 @@
 /// The external resource can be a web page, a picture, a media player, or a plug-in application.
 open class Object: Tag {
     
+    open class override var name: String? { "object" }
 }
 
 public extension Object {
diff --git a/Sources/SwiftHtml/Tags/Ol.swift b/Sources/SwiftHtml/Tags/Ol.swift
index 9777eb7..35204e1 100644
--- a/Sources/SwiftHtml/Tags/Ol.swift
+++ b/Sources/SwiftHtml/Tags/Ol.swift
@@ -14,6 +14,7 @@
 /// **Tip:** For unordered list, use the `<ul>` tag.
 open class Ol: Tag {
 
+    open class override var name: String? { "ol" }
 }
 
 public extension Ol {
diff --git a/Sources/SwiftHtml/Tags/Optgroup.swift b/Sources/SwiftHtml/Tags/Optgroup.swift
index e39272c..b7e4d3b 100644
--- a/Sources/SwiftHtml/Tags/Optgroup.swift
+++ b/Sources/SwiftHtml/Tags/Optgroup.swift
@@ -10,6 +10,7 @@
 /// If you have a long list of options, groups of related options are easier to handle for a user.
 open class Optgroup: Tag {
     
+    open class override var name: String? { "optgroup" }
 }
 
 public extension Optgroup {
diff --git a/Sources/SwiftHtml/Tags/Option.swift b/Sources/SwiftHtml/Tags/Option.swift
index df90b1c..1e5e53c 100644
--- a/Sources/SwiftHtml/Tags/Option.swift
+++ b/Sources/SwiftHtml/Tags/Option.swift
@@ -14,6 +14,7 @@
 /// **Tip:** If you have a long list of options, you can group related options within the `<optgroup>` tag.
 open class Option: Tag {
     
+    open class override var name: String? { "option" }
 }
 
 public extension Option {
diff --git a/Sources/SwiftHtml/Tags/Output.swift b/Sources/SwiftHtml/Tags/Output.swift
index bf3e93f..055fea1 100644
--- a/Sources/SwiftHtml/Tags/Output.swift
+++ b/Sources/SwiftHtml/Tags/Output.swift
@@ -8,6 +8,7 @@
 /// The `<output>` tag is used to represent the result of a calculation (like one performed by a script).
 open class Output: Tag {
     
+    open class override var name: String? { "output" }
 }
 
 public extension Output {
diff --git a/Sources/SwiftHtml/Tags/P.swift b/Sources/SwiftHtml/Tags/P.swift
index 070ca86..bdadf52 100644
--- a/Sources/SwiftHtml/Tags/P.swift
+++ b/Sources/SwiftHtml/Tags/P.swift
@@ -12,4 +12,5 @@
 /// **Tip:** Use CSS to style paragraphs.
 open class P: Tag {
     
+    open class override var name: String? { "p" }
 }
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index 6c28373..8310639 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -8,6 +8,7 @@
 /// The `<param>` tag is used to define parameters for an `<object>` element.
 open class Param: EmptyTag {
 
+    open class override var name: String? { "param" }
 }
 
 public extension Param {
diff --git a/Sources/SwiftHtml/Tags/Picture.swift b/Sources/SwiftHtml/Tags/Picture.swift
index 73c2216..38c74c6 100644
--- a/Sources/SwiftHtml/Tags/Picture.swift
+++ b/Sources/SwiftHtml/Tags/Picture.swift
@@ -18,4 +18,5 @@
 /// **Tip:** The `<picture>` element works "similar" to `<video>` and `<audio>`. You set up different sources, and the first source that fits the preferences is the one being used.
 open class Picture: Tag {
     
+    open class override var name: String? { "picture" }
 }
diff --git a/Sources/SwiftHtml/Tags/Pre.swift b/Sources/SwiftHtml/Tags/Pre.swift
index 7e7b517..439ae77 100644
--- a/Sources/SwiftHtml/Tags/Pre.swift
+++ b/Sources/SwiftHtml/Tags/Pre.swift
@@ -11,4 +11,5 @@
 /// The text will be displayed exactly as written in the HTML source code.
 open class Pre: Tag {
 
+    open class override var name: String? { "pre" }
 }
diff --git a/Sources/SwiftHtml/Tags/Progress.swift b/Sources/SwiftHtml/Tags/Progress.swift
index 57ecb58..d222266 100644
--- a/Sources/SwiftHtml/Tags/Progress.swift
+++ b/Sources/SwiftHtml/Tags/Progress.swift
@@ -10,6 +10,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Progress: Tag {
 
+    open class override var name: String? { "progress" }
 }
 
 public extension Progress {
diff --git a/Sources/SwiftHtml/Tags/Q.swift b/Sources/SwiftHtml/Tags/Q.swift
index 54d4acf..645d84e 100644
--- a/Sources/SwiftHtml/Tags/Q.swift
+++ b/Sources/SwiftHtml/Tags/Q.swift
@@ -11,7 +11,7 @@
 ///
 /// **Tip:** Use `<blockquote>` for long quotations.
 open class Q: Tag {
-
+    open class override var name: String? { "q" }
 }
 
 public extension Q {
diff --git a/Sources/SwiftHtml/Tags/Rp.swift b/Sources/SwiftHtml/Tags/Rp.swift
index b168ba9..73a2b44 100644
--- a/Sources/SwiftHtml/Tags/Rp.swift
+++ b/Sources/SwiftHtml/Tags/Rp.swift
@@ -9,5 +9,6 @@
 ///
 /// Use `<rp>` together with `<ruby>` and `<rt>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rp: Tag {
-        
+    
+    open class override var name: String? { "rp" }
 }
diff --git a/Sources/SwiftHtml/Tags/Rt.swift b/Sources/SwiftHtml/Tags/Rt.swift
index f1b3da2..95c4a4a 100644
--- a/Sources/SwiftHtml/Tags/Rt.swift
+++ b/Sources/SwiftHtml/Tags/Rt.swift
@@ -10,4 +10,5 @@
 /// Use `<rt>` together with `<ruby>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rt: Tag {
 
+    open class override var name: String? { "rt" }
 }
diff --git a/Sources/SwiftHtml/Tags/Ruby.swift b/Sources/SwiftHtml/Tags/Ruby.swift
index 6933cd2..34ec5bb 100644
--- a/Sources/SwiftHtml/Tags/Ruby.swift
+++ b/Sources/SwiftHtml/Tags/Ruby.swift
@@ -12,4 +12,5 @@
 /// Use `<ruby>` together with `<rt>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that do not support ruby annotations.
 open class Ruby: Tag {
     
+    open class override var name: String? { "ruby" }
 }
diff --git a/Sources/SwiftHtml/Tags/S.swift b/Sources/SwiftHtml/Tags/S.swift
index 42827fe..caebdee 100644
--- a/Sources/SwiftHtml/Tags/S.swift
+++ b/Sources/SwiftHtml/Tags/S.swift
@@ -10,4 +10,5 @@
 /// The `<s>` tag should not be used to define deleted text in a document, use the `<del>` tag for that.
 open class S: Tag {
     
+    open class override var name: String? { "s" }
 }
diff --git a/Sources/SwiftHtml/Tags/Samp.swift b/Sources/SwiftHtml/Tags/Samp.swift
index 7a974cb..ec606ac 100644
--- a/Sources/SwiftHtml/Tags/Samp.swift
+++ b/Sources/SwiftHtml/Tags/Samp.swift
@@ -10,4 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Samp: Tag {
 
+    open class override var name: String? { "samp" }
 }
diff --git a/Sources/SwiftHtml/Tags/Script.swift b/Sources/SwiftHtml/Tags/Script.swift
index 719eb5c..03bf3c2 100644
--- a/Sources/SwiftHtml/Tags/Script.swift
+++ b/Sources/SwiftHtml/Tags/Script.swift
@@ -12,6 +12,8 @@
 /// Common uses for JavaScript are image manipulation, form validation, and dynamic changes of content.
 open class Script: Tag {
     
+    open class override var name: String? { "script" }
+    
     public enum `Type`: String {
         case javascript = "text/javascript"
     }
diff --git a/Sources/SwiftHtml/Tags/Section.swift b/Sources/SwiftHtml/Tags/Section.swift
index 6a05e9f..2cc5065 100644
--- a/Sources/SwiftHtml/Tags/Section.swift
+++ b/Sources/SwiftHtml/Tags/Section.swift
@@ -8,4 +8,5 @@
 /// The `<section>` tag defines a section in a document.
 open class Section: Tag {
 
+    open class override var name: String? { "section" }
 }
diff --git a/Sources/SwiftHtml/Tags/Select.swift b/Sources/SwiftHtml/Tags/Select.swift
index 090339d..fceba88 100644
--- a/Sources/SwiftHtml/Tags/Select.swift
+++ b/Sources/SwiftHtml/Tags/Select.swift
@@ -18,6 +18,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Select: Tag {
     
+    open class override var name: String? { "select" }
 }
 
 public extension Select {
diff --git a/Sources/SwiftHtml/Tags/Small.swift b/Sources/SwiftHtml/Tags/Small.swift
index 8583ab5..f1cc38f 100644
--- a/Sources/SwiftHtml/Tags/Small.swift
+++ b/Sources/SwiftHtml/Tags/Small.swift
@@ -10,4 +10,5 @@
 /// **Tip:** This tag is not deprecated, but it is possible to achieve richer (or the same) effect with CSS.
 open class Small: Tag {
     
+    open class override var name: String? { "small" }
 }
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index 59dc499..49c3f93 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -12,6 +12,7 @@
 /// The browser will choose the first `<source>` it supports.
 open class Source: EmptyTag {
     
+    open class override var name: String? { "source" }
 }
 
 public extension Source {
diff --git a/Sources/SwiftHtml/Tags/Span.swift b/Sources/SwiftHtml/Tags/Span.swift
index b3cb162..544ee58 100644
--- a/Sources/SwiftHtml/Tags/Span.swift
+++ b/Sources/SwiftHtml/Tags/Span.swift
@@ -12,4 +12,5 @@
 /// The `<span>` tag is much like the `<div>` element, but `<div>` is a block-level element and `<span>` is an inline element.
 open class Span: Tag {
     
+    open class override var name: String? { "span" }
 }
diff --git a/Sources/SwiftHtml/Tags/Strong.swift b/Sources/SwiftHtml/Tags/Strong.swift
index 3abc5c3..f528229 100644
--- a/Sources/SwiftHtml/Tags/Strong.swift
+++ b/Sources/SwiftHtml/Tags/Strong.swift
@@ -10,4 +10,5 @@
 /// **Tip:** Use the `<b>` tag to specify bold text without any extra importance!
 open class Strong: Tag {
 
+    open class override var name: String? { "strong" }
 }
diff --git a/Sources/SwiftHtml/Tags/Style.swift b/Sources/SwiftHtml/Tags/Style.swift
index 1cbb7a9..c201502 100644
--- a/Sources/SwiftHtml/Tags/Style.swift
+++ b/Sources/SwiftHtml/Tags/Style.swift
@@ -11,6 +11,7 @@
 /// Inside the `<style>` element you specify how HTML elements should render in a browser.
 open class Style: Tag {
 
+    open class override var name: String? { "style" }
 }
 
 public extension Style {
diff --git a/Sources/SwiftHtml/Tags/Sub.swift b/Sources/SwiftHtml/Tags/Sub.swift
index 823c208..ab17f5b 100644
--- a/Sources/SwiftHtml/Tags/Sub.swift
+++ b/Sources/SwiftHtml/Tags/Sub.swift
@@ -13,4 +13,5 @@
 /// **Tip:** Use the `<sup>` tag to define superscripted text.
 open class Sub: Tag {
     
+    open class override var name: String? { "sub" }
 }
diff --git a/Sources/SwiftHtml/Tags/Summary.swift b/Sources/SwiftHtml/Tags/Summary.swift
index 756aa34..af15b16 100644
--- a/Sources/SwiftHtml/Tags/Summary.swift
+++ b/Sources/SwiftHtml/Tags/Summary.swift
@@ -10,4 +10,5 @@
 /// **Note:** The `<summary>` element should be the first child element of the `<details>` element.
 open class Summary: Tag {
     
+    open class override var name: String? { "summary" }
 }
diff --git a/Sources/SwiftHtml/Tags/Sup.swift b/Sources/SwiftHtml/Tags/Sup.swift
index 3ced2c3..5da017e 100644
--- a/Sources/SwiftHtml/Tags/Sup.swift
+++ b/Sources/SwiftHtml/Tags/Sup.swift
@@ -13,4 +13,5 @@
 /// **Tip:** Use the `<sub>` tag to define subscript text.
 open class Sup: Tag {
     
+    open class override var name: String? { "sup" }
 }
diff --git a/Sources/SwiftHtml/Tags/Table.swift b/Sources/SwiftHtml/Tags/Table.swift
index c044b49..c701c98 100644
--- a/Sources/SwiftHtml/Tags/Table.swift
+++ b/Sources/SwiftHtml/Tags/Table.swift
@@ -14,4 +14,5 @@
 /// An HTML table may also include `<caption>`, `<colgroup>`, `<thead>`, `<tfoot>`, and `<tbody>` elements.
 open class Table: Tag {
 
+    open class override var name: String? { "table" }
 }
diff --git a/Sources/SwiftHtml/Tags/Tbody.swift b/Sources/SwiftHtml/Tags/Tbody.swift
index e8521c1..a335cdf 100644
--- a/Sources/SwiftHtml/Tags/Tbody.swift
+++ b/Sources/SwiftHtml/Tags/Tbody.swift
@@ -19,5 +19,6 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tbody: Tag {
     
+    open class override var name: String? { "tbody" }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Td.swift b/Sources/SwiftHtml/Tags/Td.swift
index 75da635..4387ba0 100644
--- a/Sources/SwiftHtml/Tags/Td.swift
+++ b/Sources/SwiftHtml/Tags/Td.swift
@@ -17,6 +17,7 @@
 /// The text in `<th>` elements are bold and centered by default.
 open class Td: Tag {
 
+    open class override var name: String? { "td" }
 }
 
 public extension Td {
diff --git a/Sources/SwiftHtml/Tags/Template.swift b/Sources/SwiftHtml/Tags/Template.swift
index 6928587..c308aea 100644
--- a/Sources/SwiftHtml/Tags/Template.swift
+++ b/Sources/SwiftHtml/Tags/Template.swift
@@ -13,6 +13,7 @@
 /// To do this without the `<template>` tag, you have to create the HTML code with JavaScript to prevent the browser from rendering the code.
 open class Template: Tag {
 
+    open class override var name: String? { "template" }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Textarea.swift b/Sources/SwiftHtml/Tags/Textarea.swift
index 2bbaf23..a9a5d0c 100644
--- a/Sources/SwiftHtml/Tags/Textarea.swift
+++ b/Sources/SwiftHtml/Tags/Textarea.swift
@@ -20,6 +20,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Textarea: Tag {
 
+    open class override var name: String? { "textarea" }
 }
 
 public extension Textarea {
diff --git a/Sources/SwiftHtml/Tags/Tfoot.swift b/Sources/SwiftHtml/Tags/Tfoot.swift
index 80c621e..6764a55 100644
--- a/Sources/SwiftHtml/Tags/Tfoot.swift
+++ b/Sources/SwiftHtml/Tags/Tfoot.swift
@@ -19,4 +19,5 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tfoot: Tag {
 
+    open class override var name: String? { "tfoot" }
 }
diff --git a/Sources/SwiftHtml/Tags/Th.swift b/Sources/SwiftHtml/Tags/Th.swift
index 43b5478..290af62 100644
--- a/Sources/SwiftHtml/Tags/Th.swift
+++ b/Sources/SwiftHtml/Tags/Th.swift
@@ -17,6 +17,7 @@
 /// The text in `<td>` elements are regular and left-aligned by default.
 open class Th: Tag {
     
+    open class override var name: String? { "th" }
 }
 
 public extension Th {
diff --git a/Sources/SwiftHtml/Tags/Thead.swift b/Sources/SwiftHtml/Tags/Thead.swift
index b6bd3db..3f4e367 100644
--- a/Sources/SwiftHtml/Tags/Thead.swift
+++ b/Sources/SwiftHtml/Tags/Thead.swift
@@ -19,4 +19,5 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Thead: Tag {
 
+    open class override var name: String? { "thead" }
 }
diff --git a/Sources/SwiftHtml/Tags/Time.swift b/Sources/SwiftHtml/Tags/Time.swift
index c22b387..d4644ae 100644
--- a/Sources/SwiftHtml/Tags/Time.swift
+++ b/Sources/SwiftHtml/Tags/Time.swift
@@ -10,6 +10,7 @@
 /// The datetime attribute of this element is used translate the time into a machine-readable format so that browsers can offer to add date reminders through the user's calendar, and search engines can produce smarter search results.
 open class Time: Tag {
 
+    open class override var name: String? { "time" }
 }
 
 public extension Time {
diff --git a/Sources/SwiftHtml/Tags/Title.swift b/Sources/SwiftHtml/Tags/Title.swift
index 2879995..59397c6 100644
--- a/Sources/SwiftHtml/Tags/Title.swift
+++ b/Sources/SwiftHtml/Tags/Title.swift
@@ -28,4 +28,5 @@
 /// **Note:** You can NOT have more than one `<title>` element in an HTML document.
 open class Title: Tag {
 
+    open class override var name: String? { "title" }
 }
diff --git a/Sources/SwiftHtml/Tags/Tr.swift b/Sources/SwiftHtml/Tags/Tr.swift
index 197e9be..f7956b9 100644
--- a/Sources/SwiftHtml/Tags/Tr.swift
+++ b/Sources/SwiftHtml/Tags/Tr.swift
@@ -10,4 +10,5 @@
 /// A `<tr>` element contains one or more `<th>` or `<td>` elements.
 open class Tr: Tag {
 
+    open class override var name: String? { "tr" }
 }
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index 22aa8f6..51469df 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -12,6 +12,8 @@
 /// Tracks are formatted in WebVTT format (.vtt files).
 open class Track: EmptyTag {
     
+    open class override var name: String? { "track" }
+    
     public init(src: String) {
         super.init()
         setAttributes([
diff --git a/Sources/SwiftHtml/Tags/U.swift b/Sources/SwiftHtml/Tags/U.swift
index c13affc..75c7c19 100644
--- a/Sources/SwiftHtml/Tags/U.swift
+++ b/Sources/SwiftHtml/Tags/U.swift
@@ -13,4 +13,5 @@
 /// **Tip:** Avoid using the `<u>` element where it could be confused for a hyperlink!
 open class U: Tag {
 
+    open class override var name: String? { "u" }
 }
diff --git a/Sources/SwiftHtml/Tags/Ul.swift b/Sources/SwiftHtml/Tags/Ul.swift
index 1ece09a..1b0bcca 100644
--- a/Sources/SwiftHtml/Tags/Ul.swift
+++ b/Sources/SwiftHtml/Tags/Ul.swift
@@ -14,4 +14,5 @@
 /// **Tip:** For ordered lists, use the `<ol>` tag.
 open class Ul: Tag {
 
+    open class override var name: String? { "ul" }
 }
diff --git a/Sources/SwiftHtml/Tags/Var.swift b/Sources/SwiftHtml/Tags/Var.swift
index 09a1797..11b6410 100644
--- a/Sources/SwiftHtml/Tags/Var.swift
+++ b/Sources/SwiftHtml/Tags/Var.swift
@@ -10,4 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Var: Tag {
 
+    open class override var name: String? { "var" }
 }
diff --git a/Sources/SwiftHtml/Tags/Video.swift b/Sources/SwiftHtml/Tags/Video.swift
index 4ee2223..0d79760 100644
--- a/Sources/SwiftHtml/Tags/Video.swift
+++ b/Sources/SwiftHtml/Tags/Video.swift
@@ -22,6 +22,7 @@
 ///     Opera   | YES | YES  | YES
 open class Video: Tag {
 
+    open class override var name: String? { "video" }
 }
 
 public extension Video {
diff --git a/Sources/SwiftHtml/Tags/Wbr.swift b/Sources/SwiftHtml/Tags/Wbr.swift
index e42ce8d..ac57b35 100644
--- a/Sources/SwiftHtml/Tags/Wbr.swift
+++ b/Sources/SwiftHtml/Tags/Wbr.swift
@@ -10,4 +10,5 @@
 /// **Tip:** When a word is too long, the browser might break it at the wrong place. You can use the `<wbr>` element to add word break opportunities.
 open class Wbr: Tag {
 
+    open class override var name: String? { "wbr" }
 }

From 8e4c2411f71390e0a22a411ab828a95f9e637009 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 6 Jul 2023 11:39:14 -0400
Subject: [PATCH 006/141] Init Tag with Optional Node

---
 Sources/SwiftSgml/Tag.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 530fcde..bee32ed 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -17,8 +17,8 @@ open class Tag {
     }
 
     /// initialize a new Tag with child tags
-    public init(_ children: [Tag] = []) {
-        self.node = Self.createNode()
+    public init(node: Node? = nil, _ children: [Tag] = []) {
+        self.node = node ?? Self.createNode()
         self.children = children
     }
 

From 9187c09c7a9d6b9ab4529fd9ac0faf915db3ff25 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 6 Jul 2023 12:27:16 -0400
Subject: [PATCH 007/141] Reverting to init with optional Node

---
 Sources/SwiftHtml/Tags/A.swift          |  5 +-
 Sources/SwiftHtml/Tags/Abbr.swift       |  5 +-
 Sources/SwiftHtml/Tags/Address.swift    |  5 +-
 Sources/SwiftHtml/Tags/Area.swift       |  2 -
 Sources/SwiftHtml/Tags/Article.swift    |  5 +-
 Sources/SwiftHtml/Tags/Aside.swift      |  5 +-
 Sources/SwiftHtml/Tags/Audio.swift      |  5 +-
 Sources/SwiftHtml/Tags/B.swift          |  5 +-
 Sources/SwiftHtml/Tags/Base.swift       |  5 +-
 Sources/SwiftHtml/Tags/Bdi.swift        |  5 +-
 Sources/SwiftHtml/Tags/Bdo.swift        |  2 -
 Sources/SwiftHtml/Tags/Blockquote.swift |  5 +-
 Sources/SwiftHtml/Tags/Body.swift       |  5 +-
 Sources/SwiftHtml/Tags/Br.swift         |  5 +-
 Sources/SwiftHtml/Tags/Button.swift     |  5 +-
 Sources/SwiftHtml/Tags/Canvas.swift     |  5 +-
 Sources/SwiftHtml/Tags/Caption.swift    |  5 +-
 Sources/SwiftHtml/Tags/Cite.swift       |  5 +-
 Sources/SwiftHtml/Tags/Code.swift       |  5 +-
 Sources/SwiftHtml/Tags/Col.swift        |  5 +-
 Sources/SwiftHtml/Tags/Colgroup.swift   |  5 +-
 Sources/SwiftHtml/Tags/Comment.swift    |  4 --
 Sources/SwiftHtml/Tags/Data.swift       |  5 +-
 Sources/SwiftHtml/Tags/Datalist.swift   |  5 +-
 Sources/SwiftHtml/Tags/Dd.swift         |  5 +-
 Sources/SwiftHtml/Tags/Del.swift        |  5 +-
 Sources/SwiftHtml/Tags/Details.swift    |  5 +-
 Sources/SwiftHtml/Tags/Dfn.swift        |  1 -
 Sources/SwiftHtml/Tags/Dialog.swift     |  1 -
 Sources/SwiftHtml/Tags/Div.swift        |  5 +-
 Sources/SwiftHtml/Tags/Dl.swift         |  5 +-
 Sources/SwiftHtml/Tags/Dt.swift         |  5 +-
 Sources/SwiftHtml/Tags/Em.swift         |  5 +-
 Sources/SwiftHtml/Tags/Embed.swift      |  5 +-
 Sources/SwiftHtml/Tags/Fieldset.swift   |  5 +-
 Sources/SwiftHtml/Tags/Figcaption.swift |  5 +-
 Sources/SwiftHtml/Tags/Figure.swift     |  5 +-
 Sources/SwiftHtml/Tags/Footer.swift     |  5 +-
 Sources/SwiftHtml/Tags/Form.swift       |  5 +-
 Sources/SwiftHtml/Tags/H1.swift         |  5 +-
 Sources/SwiftHtml/Tags/H2.swift         |  5 +-
 Sources/SwiftHtml/Tags/H3.swift         |  5 +-
 Sources/SwiftHtml/Tags/H4.swift         |  5 +-
 Sources/SwiftHtml/Tags/H5.swift         |  5 +-
 Sources/SwiftHtml/Tags/H6.swift         |  5 +-
 Sources/SwiftHtml/Tags/Head.swift       |  5 +-
 Sources/SwiftHtml/Tags/Header.swift     |  5 +-
 Sources/SwiftHtml/Tags/Hr.swift         |  5 +-
 Sources/SwiftHtml/Tags/Html.swift       |  5 +-
 Sources/SwiftHtml/Tags/I.swift          |  5 +-
 Sources/SwiftHtml/Tags/Iframe.swift     |  5 +-
 Sources/SwiftHtml/Tags/Img.swift        |  2 -
 Sources/SwiftHtml/Tags/Input.swift      |  5 +-
 Sources/SwiftHtml/Tags/Ins.swift        |  5 +-
 Sources/SwiftHtml/Tags/Kbd.swift        |  5 +-
 Sources/SwiftHtml/Tags/Label.swift      |  5 +-
 Sources/SwiftHtml/Tags/Legend.swift     |  5 +-
 Sources/SwiftHtml/Tags/Li.swift         |  5 +-
 Sources/SwiftHtml/Tags/Link.swift       |  2 -
 Sources/SwiftHtml/Tags/MainTag.swift    |  5 +-
 Sources/SwiftHtml/Tags/Map.swift        |  2 -
 Sources/SwiftHtml/Tags/Mark.swift       |  5 +-
 Sources/SwiftHtml/Tags/Meta.swift       |  5 +-
 Sources/SwiftHtml/Tags/Meter.swift      |  2 -
 Sources/SwiftHtml/Tags/Nav.swift        |  5 +-
 Sources/SwiftHtml/Tags/Noscript.swift   |  5 +-
 Sources/SwiftHtml/Tags/Object.swift     |  5 +-
 Sources/SwiftHtml/Tags/Ol.swift         |  5 +-
 Sources/SwiftHtml/Tags/Optgroup.swift   |  5 +-
 Sources/SwiftHtml/Tags/Option.swift     |  5 +-
 Sources/SwiftHtml/Tags/Output.swift     |  5 +-
 Sources/SwiftHtml/Tags/P.swift          |  5 +-
 Sources/SwiftHtml/Tags/Param.swift      |  5 +-
 Sources/SwiftHtml/Tags/Picture.swift    |  5 +-
 Sources/SwiftHtml/Tags/Pre.swift        |  5 +-
 Sources/SwiftHtml/Tags/Progress.swift   |  5 +-
 Sources/SwiftHtml/Tags/Q.swift          |  4 +-
 Sources/SwiftHtml/Tags/Rp.swift         |  5 +-
 Sources/SwiftHtml/Tags/Rt.swift         |  5 +-
 Sources/SwiftHtml/Tags/Ruby.swift       |  5 +-
 Sources/SwiftHtml/Tags/S.swift          |  5 +-
 Sources/SwiftHtml/Tags/Samp.swift       |  5 +-
 Sources/SwiftHtml/Tags/Script.swift     |  2 -
 Sources/SwiftHtml/Tags/Section.swift    |  5 +-
 Sources/SwiftHtml/Tags/Select.swift     |  5 +-
 Sources/SwiftHtml/Tags/Small.swift      |  5 +-
 Sources/SwiftHtml/Tags/Source.swift     |  5 +-
 Sources/SwiftHtml/Tags/Span.swift       |  5 +-
 Sources/SwiftHtml/Tags/Strong.swift     |  5 +-
 Sources/SwiftHtml/Tags/Style.swift      |  5 +-
 Sources/SwiftHtml/Tags/Sub.swift        |  5 +-
 Sources/SwiftHtml/Tags/Summary.swift    |  5 +-
 Sources/SwiftHtml/Tags/Sup.swift        |  5 +-
 Sources/SwiftHtml/Tags/Table.swift      |  5 +-
 Sources/SwiftHtml/Tags/Tbody.swift      |  5 +-
 Sources/SwiftHtml/Tags/Td.swift         |  5 +-
 Sources/SwiftHtml/Tags/Template.swift   |  5 +-
 Sources/SwiftHtml/Tags/Textarea.swift   |  5 +-
 Sources/SwiftHtml/Tags/Tfoot.swift      |  5 +-
 Sources/SwiftHtml/Tags/Th.swift         |  5 +-
 Sources/SwiftHtml/Tags/Thead.swift      |  5 +-
 Sources/SwiftHtml/Tags/Time.swift       |  5 +-
 Sources/SwiftHtml/Tags/Title.swift      |  5 +-
 Sources/SwiftHtml/Tags/Tr.swift         |  5 +-
 Sources/SwiftHtml/Tags/Track.swift      |  2 -
 Sources/SwiftHtml/Tags/U.swift          |  5 +-
 Sources/SwiftHtml/Tags/Ul.swift         |  5 +-
 Sources/SwiftHtml/Tags/Var.swift        |  5 +-
 Sources/SwiftHtml/Tags/Video.swift      |  5 +-
 Sources/SwiftHtml/Tags/Wbr.swift        |  5 +-
 Sources/SwiftRss/LastBuildDate.swift    |  5 +-
 Sources/SwiftRss/PubDate.swift          |  5 +-
 Sources/SwiftSgml/EmptyTag.swift        |  2 +-
 Sources/SwiftSgml/GroupTag.swift        |  7 +--
 Sources/SwiftSgml/Tag.swift             | 63 ++++++++++++++++++-------
 115 files changed, 148 insertions(+), 450 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index a5eb06b..e167ecb 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -14,10 +14,7 @@
 /// - An unvisited link is underlined and blue
 /// - A visited link is underlined and purple
 /// - An active link is underlined and red
-open class A: Tag {
-
-    open class override var name: String? { "a" }
-}
+open class A: Tag {}
 
 public extension A {
     
diff --git a/Sources/SwiftHtml/Tags/Abbr.swift b/Sources/SwiftHtml/Tags/Abbr.swift
index adba283..b9c4961 100644
--- a/Sources/SwiftHtml/Tags/Abbr.swift
+++ b/Sources/SwiftHtml/Tags/Abbr.swift
@@ -8,8 +8,5 @@
 /// The `<abbr>` tag defines an abbreviation or an acronym, like "HTML", "CSS", "Mr.", "Dr.", "ASAP", "ATM".
 ///
 /// **Tip:** Use the global title attribute to show the description for the abbreviation/acronym when you mouse over the element.
-open class Abbr: Tag {
-
-    open class override var name: String? { "abbr" }
-}
+open class Abbr: Tag {}
 
diff --git a/Sources/SwiftHtml/Tags/Address.swift b/Sources/SwiftHtml/Tags/Address.swift
index 426957a..acacce9 100644
--- a/Sources/SwiftHtml/Tags/Address.swift
+++ b/Sources/SwiftHtml/Tags/Address.swift
@@ -10,7 +10,4 @@
 /// The contact information can be an email address, URL, physical address, phone number, social media handle, etc.
 ///
 /// The text in the `<address>` element usually renders in italic, and browsers will always add a line break before and after the `<address>` element.
-open class Address: Tag {
-
-    open class override var name: String? { "address" }
-}
+open class Address: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index 46f76ab..34f6291 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -50,8 +50,6 @@ open class Area: EmptyTag {
         /// Defines a polygonal region
         case poly
     }
-
-    open class override var name: String? { "area" }
 }
 
 public extension Area {
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index 4f7ebaa..68d6a48 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -24,8 +24,5 @@ public extension Node {
 ///
 /// **Note:** The `<article>` element does not render as anything special in a browser.
 /// However, you can use CSS to style the `<article>` element (see example below).
-open class Article: Tag {
-
-    open class override var name: String? { "article" }
-}
+open class Article: Tag {}
 
diff --git a/Sources/SwiftHtml/Tags/Aside.swift b/Sources/SwiftHtml/Tags/Aside.swift
index e3afcce..2d84c35 100644
--- a/Sources/SwiftHtml/Tags/Aside.swift
+++ b/Sources/SwiftHtml/Tags/Aside.swift
@@ -13,8 +13,5 @@
 /// 
 /// **Note:** The `<aside>` element does not render as anything special in a browser.
 /// However, you can use CSS to style the `<aside>` element (see example below).
-open class Aside: Tag {
-    
-    open class override var name: String? { "aside" }
-}
+open class Aside: Tag {}
 
diff --git a/Sources/SwiftHtml/Tags/Audio.swift b/Sources/SwiftHtml/Tags/Audio.swift
index e508efd..d0afad7 100644
--- a/Sources/SwiftHtml/Tags/Audio.swift
+++ b/Sources/SwiftHtml/Tags/Audio.swift
@@ -21,10 +21,7 @@
 ///     Safari   | YES | YES  | NO
 ///     Opera    | YES | YES  | YES
 ///      *From Edge 79
-open class Audio: Tag {
-    
-    open class override var name: String? { "audio" }
-}
+open class Audio: Tag {}
 
 public extension Audio {
     
diff --git a/Sources/SwiftHtml/Tags/B.swift b/Sources/SwiftHtml/Tags/B.swift
index 65f7e45..a29bc71 100644
--- a/Sources/SwiftHtml/Tags/B.swift
+++ b/Sources/SwiftHtml/Tags/B.swift
@@ -6,7 +6,4 @@
 //
 
 /// Make some text bold (without marking it as important)
-open class B: Tag {
-    
-    open class override var name: String? { "b" }
-}
+open class B: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index 0e63b10..05f5e5b 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -10,10 +10,7 @@
 /// The `<base>` tag must have either an href or a target attribute present, or both.
 ///
 /// There can only be one single `<base>` element in a document, and it must be inside the `<head>` element.
-open class Base: EmptyTag {
-
-    open class override var name: String? { "base" }
-}
+open class Base: EmptyTag {}
 
 public extension Base {
     /// Specifies the base URL for all relative URLs in the page
diff --git a/Sources/SwiftHtml/Tags/Bdi.swift b/Sources/SwiftHtml/Tags/Bdi.swift
index 27dac2e..2a3da7b 100644
--- a/Sources/SwiftHtml/Tags/Bdi.swift
+++ b/Sources/SwiftHtml/Tags/Bdi.swift
@@ -10,7 +10,4 @@
 /// The `<bdi>` tag isolates a part of text that might be formatted in a different direction from other text outside it.
 ///
 /// This element is useful when embedding user-generated content with an unknown text direction.
-open class Bdi: Tag {
-    
-    open class override var name: String? { "bdi" }
-}
+open class Bdi: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Bdo.swift b/Sources/SwiftHtml/Tags/Bdo.swift
index 158201d..23dccdb 100644
--- a/Sources/SwiftHtml/Tags/Bdo.swift
+++ b/Sources/SwiftHtml/Tags/Bdo.swift
@@ -9,8 +9,6 @@
 ///
 /// The `<bdo>` tag is used to override the current text direction.
 open class Bdo: Tag {
-    
-    open class override var name: String? { "bdo" }
 
     public init(_ contents: String, dir: TextDirection = .ltr) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Blockquote.swift b/Sources/SwiftHtml/Tags/Blockquote.swift
index c22c4a6..9ca6fed 100644
--- a/Sources/SwiftHtml/Tags/Blockquote.swift
+++ b/Sources/SwiftHtml/Tags/Blockquote.swift
@@ -8,10 +8,7 @@
 /// The `<blockquote>` tag specifies a section that is quoted from another source.
 /// 
 /// Browsers usually indent `<blockquote>` elements (look at example below to see how to remove the indentation).
-open class Blockquote: Tag {
-
-    open class override var name: String? { "blockquote" }
-}
+open class Blockquote: Tag {}
 
 public extension Blockquote {
     /// Specifies the source of the quotation
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 1e7ed14..0e74f86 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -10,7 +10,4 @@
 /// The `<body>` element contains all the contents of an HTML document, such as headings, paragraphs, images, hyperlinks, tables, lists, etc.
 /// 
 /// **Note:** There can only be one `<body>` element in an HTML document.
-open class Body: Tag {
-
-    open class override var name: String? { "body" }
-}
+open class Body: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index a6a0b21..5461853 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -10,7 +10,4 @@
 /// The `<br>` tag is useful for writing addresses or poems.
 /// 
 /// The `<br>` tag is an empty tag which means that it has no end tag.
-open class Br: EmptyTag {
-    
-    open class override var name: String? { "br" }
-}
+open class Br: EmptyTag {}
diff --git a/Sources/SwiftHtml/Tags/Button.swift b/Sources/SwiftHtml/Tags/Button.swift
index 3dbff9c..b53fe5f 100644
--- a/Sources/SwiftHtml/Tags/Button.swift
+++ b/Sources/SwiftHtml/Tags/Button.swift
@@ -12,10 +12,7 @@
 /// **Tip:** Always specify the type attribute for a `<button>` element, to tell browsers what type of button it is.
 ///
 /// **Tip:** You can easily style buttons with CSS! Look at the examples below or visit our CSS Buttons tutorial.
-open class Button: Tag {
-    
-    open class override var name: String? { "button" }
-}
+open class Button: Tag {}
 
 public extension Button {
     
diff --git a/Sources/SwiftHtml/Tags/Canvas.swift b/Sources/SwiftHtml/Tags/Canvas.swift
index ea54b32..2c8f780 100644
--- a/Sources/SwiftHtml/Tags/Canvas.swift
+++ b/Sources/SwiftHtml/Tags/Canvas.swift
@@ -10,10 +10,7 @@
 /// The `<canvas>` tag is transparent, and is only a container for graphics, you must use a script to actually draw the graphics.
 /// 
 /// Any text inside the `<canvas>` element will be displayed in browsers with JavaScript disabled and in browsers that do not support <canvas>.
-open class Canvas: Tag {
-    
-    open class override var name: String? { "canvas" }
-}
+open class Canvas: Tag {}
 
 public extension Canvas {
 
diff --git a/Sources/SwiftHtml/Tags/Caption.swift b/Sources/SwiftHtml/Tags/Caption.swift
index cd30036..d17063a 100644
--- a/Sources/SwiftHtml/Tags/Caption.swift
+++ b/Sources/SwiftHtml/Tags/Caption.swift
@@ -10,7 +10,4 @@
 /// The `<caption>` tag must be inserted immediately after the `<table>` tag.
 /// 
 /// **Tip:** By default, a table caption will be center-aligned above a table. However, the CSS properties text-align and caption-side can be used to align and place the caption.
-open class Caption: Tag {
-
-    open class override var name: String? { "caption" }
-}
+open class Caption: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Cite.swift b/Sources/SwiftHtml/Tags/Cite.swift
index 05a78e5..7f59782 100644
--- a/Sources/SwiftHtml/Tags/Cite.swift
+++ b/Sources/SwiftHtml/Tags/Cite.swift
@@ -10,7 +10,4 @@
 /// **Note:** A person's name is not the title of a work.
 /// 
 /// The text in the `<cite>` element usually renders in italic.
-open class Cite: Tag {
-    
-    open class override var name: String? { "cite" }
-}
+open class Cite: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Code.swift b/Sources/SwiftHtml/Tags/Code.swift
index 1efcbc7..ede3ebc 100644
--- a/Sources/SwiftHtml/Tags/Code.swift
+++ b/Sources/SwiftHtml/Tags/Code.swift
@@ -14,7 +14,4 @@
 /// - `<kbd>`    Defines keyboard input
 /// - `<var>`    Defines a variable
 /// - `<pre>`    Defines preformatted text
-open class Code: Tag {
-
-    open class override var name: String? { "code" }
-}
+open class Code: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index a00e813..c087c13 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -8,10 +8,7 @@
 /// The `<col>` tag specifies column properties for each column within a `<colgroup>` element.
 /// 
 /// The `<col>` tag is useful for applying styles to entire columns, instead of repeating the styles for each cell, for each row.
-open class Col: EmptyTag {
-    
-    open class override var name: String? { "col" }
-}
+open class Col: EmptyTag {}
 
 public extension Col {
     
diff --git a/Sources/SwiftHtml/Tags/Colgroup.swift b/Sources/SwiftHtml/Tags/Colgroup.swift
index d826858..6011375 100644
--- a/Sources/SwiftHtml/Tags/Colgroup.swift
+++ b/Sources/SwiftHtml/Tags/Colgroup.swift
@@ -12,10 +12,7 @@
 /// **Note:** The `<colgroup>` tag must be a child of a `<table>` element, after any `<caption>` elements and before any `<thead>`, `<tbody>`, `<tfoot>`, and `<tr>` elements.
 ///
 /// **Tip:** To define different properties to a column within a `<colgroup>`, use the `<col>` tag within the `<colgroup>` tag.
-open class Colgroup: Tag {
-
-    open class override var name: String? { "colgroup" }
-}
+open class Colgroup: Tag {}
 
 public extension Colgroup {
     
diff --git a/Sources/SwiftHtml/Tags/Comment.swift b/Sources/SwiftHtml/Tags/Comment.swift
index 21be1ab..a9af8a0 100644
--- a/Sources/SwiftHtml/Tags/Comment.swift
+++ b/Sources/SwiftHtml/Tags/Comment.swift
@@ -13,10 +13,6 @@
 /// You can use comments to explain your code, which can help you when you edit the source code at a later date.
 /// This is especially useful if you have a lot of code.
 open class Comment: Tag {
-
-    open class override var name: String? { nil }
-
-    open class override var type: Node.NodeType { .comment }
     
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Data.swift b/Sources/SwiftHtml/Tags/Data.swift
index 28dd893..83853ba 100644
--- a/Sources/SwiftHtml/Tags/Data.swift
+++ b/Sources/SwiftHtml/Tags/Data.swift
@@ -10,10 +10,7 @@
 /// This element provides both a machine-readable value for data processors, and a human-readable value for rendering in a browser.
 ///
 /// **Tip:** If the content is time- or date-related, use the `<time>` element instead.
-open class Data: Tag {
-    
-    open class override var name: String? { "data" }
-}
+open class Data: Tag {}
 
 public extension Data {
     
diff --git a/Sources/SwiftHtml/Tags/Datalist.swift b/Sources/SwiftHtml/Tags/Datalist.swift
index 2f33403..1430fdc 100644
--- a/Sources/SwiftHtml/Tags/Datalist.swift
+++ b/Sources/SwiftHtml/Tags/Datalist.swift
@@ -10,7 +10,4 @@
 /// The `<datalist>` tag is used to provide an "autocomplete" feature for `<input>` elements. Users will see a drop-down list of pre-defined options as they input data.
 ///
 /// The `<datalist>` element's id attribute must be equal to the `<input>` element's list attribute (this binds them together).
-open class Datalist: Tag {
- 
-    open class override var name: String? { "datalist" }
-}
+open class Datalist: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Dd.swift b/Sources/SwiftHtml/Tags/Dd.swift
index b647eae..8ea030c 100644
--- a/Sources/SwiftHtml/Tags/Dd.swift
+++ b/Sources/SwiftHtml/Tags/Dd.swift
@@ -10,7 +10,4 @@
 /// The `<dd>` tag is used in conjunction with `<dl>` (defines a description list) and `<dt>` (defines terms/names).
 /// 
 /// Inside a `<dd>` tag you can put paragraphs, line breaks, images, links, lists, etc.
-open class Dd: Tag {
-
-    open class override var name: String? { "dd" }
-}
+open class Dd: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Del.swift b/Sources/SwiftHtml/Tags/Del.swift
index 3b3706c..24a2801 100644
--- a/Sources/SwiftHtml/Tags/Del.swift
+++ b/Sources/SwiftHtml/Tags/Del.swift
@@ -8,10 +8,7 @@
 /// The `<del>` tag defines text that has been deleted from a document.
 ///
 /// Browsers will usually strike a line through deleted text.
-open class Del: Tag {
-    
-    open class override var name: String? { "del" }
-}
+open class Del: Tag {}
 
 public extension Del {
     
diff --git a/Sources/SwiftHtml/Tags/Details.swift b/Sources/SwiftHtml/Tags/Details.swift
index 0bbf71e..cd6c9d8 100644
--- a/Sources/SwiftHtml/Tags/Details.swift
+++ b/Sources/SwiftHtml/Tags/Details.swift
@@ -12,10 +12,7 @@
 /// Any sort of content can be put inside the `<details>` tag.
 ///
 /// **Tip:** The `<summary>` tag is used in conjuction with `<details>` to specify a visible heading for the details.
-open class Details: Tag {
-
-    open class override var name: String? { "details" }
-}
+open class Details: Tag {}
 
 public extension Details {
     
diff --git a/Sources/SwiftHtml/Tags/Dfn.swift b/Sources/SwiftHtml/Tags/Dfn.swift
index f7df07b..0432541 100644
--- a/Sources/SwiftHtml/Tags/Dfn.swift
+++ b/Sources/SwiftHtml/Tags/Dfn.swift
@@ -13,5 +13,4 @@
 /// `<p><dfn>HTML</dfn> is the standard markup language for creating web pages.</p>`
 open class Dfn: Tag {
     
-    open class override var name: String? { "dfn" }
 }
diff --git a/Sources/SwiftHtml/Tags/Dialog.swift b/Sources/SwiftHtml/Tags/Dialog.swift
index a3183bd..bf9ea95 100644
--- a/Sources/SwiftHtml/Tags/Dialog.swift
+++ b/Sources/SwiftHtml/Tags/Dialog.swift
@@ -10,7 +10,6 @@
 /// The `<dialog>` element makes it easy to create popup dialogs and modals on a web page.
 open class Dialog: Tag {
     
-    open class override var name: String? { "dialog" }
 }
 
 public extension Dialog {
diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index 84f91a0..557c2f8 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -14,10 +14,7 @@
 /// Any sort of content can be put inside the `<div>` tag!
 ///
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
-open class Div: Tag {
-
-    open class override var name: String? { "div" }
-}
+open class Div: Tag {}
 
 
 
diff --git a/Sources/SwiftHtml/Tags/Dl.swift b/Sources/SwiftHtml/Tags/Dl.swift
index 4e56052..28ba922 100644
--- a/Sources/SwiftHtml/Tags/Dl.swift
+++ b/Sources/SwiftHtml/Tags/Dl.swift
@@ -8,7 +8,4 @@
 /// The `<dl>` tag defines a description list.
 ///
 /// The `<dl>` tag is used in conjunction with `<dt>` (defines terms/names) and `<dd>` (describes each term/name).
-open class Dl: Tag {
-
-    open class override var name: String? { "dl" }
-}
+open class Dl: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Dt.swift b/Sources/SwiftHtml/Tags/Dt.swift
index 4bfe582..85080ba 100644
--- a/Sources/SwiftHtml/Tags/Dt.swift
+++ b/Sources/SwiftHtml/Tags/Dt.swift
@@ -8,7 +8,4 @@
 /// The `<dt>` tag defines a term/name in a description list.
 /// 
 /// The `<dt>` tag is used in conjunction with `<dl>` (defines a description list) and `<dd>` (describes each term/name).
-open class Dt: Tag {
-    
-    open class override var name: String? { "dt" }
-}
+open class Dt: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Em.swift b/Sources/SwiftHtml/Tags/Em.swift
index 655125e..dce0771 100644
--- a/Sources/SwiftHtml/Tags/Em.swift
+++ b/Sources/SwiftHtml/Tags/Em.swift
@@ -8,7 +8,4 @@
 /// The `<em>` tag is used to define emphasized text. The content inside is typically displayed in italic.
 ///
 /// A screen reader will pronounce the words in `<em>` with an emphasis, using verbal stress.
-open class Em: Tag {
-
-    open class override var name: String? { "em" }
-}
+open class Em: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index 6fbebb5..5ca16b0 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -6,10 +6,7 @@
 //
 
 /// The `<embed>` tag defines a container for an external resource, such as a web page, a picture, a media player, or a plug-in application.
-open class Embed: EmptyTag {
-
-    open class override var name: String? { "embed" }
-}
+open class Embed: EmptyTag {}
 
 
 public extension Embed {
diff --git a/Sources/SwiftHtml/Tags/Fieldset.swift b/Sources/SwiftHtml/Tags/Fieldset.swift
index a055492..4104b11 100644
--- a/Sources/SwiftHtml/Tags/Fieldset.swift
+++ b/Sources/SwiftHtml/Tags/Fieldset.swift
@@ -8,10 +8,7 @@
 /// The `<fieldset>` tag is used to group related elements in a form.
 /// 
 /// The `<fieldset>` tag draws a box around the related elements.
-open class Fieldset: Tag {
-    
-    open class override var name: String? { "fieldset" }
-}
+open class Fieldset: Tag {}
 
 public extension Fieldset {
     
diff --git a/Sources/SwiftHtml/Tags/Figcaption.swift b/Sources/SwiftHtml/Tags/Figcaption.swift
index 4109e2b..55d0c1d 100644
--- a/Sources/SwiftHtml/Tags/Figcaption.swift
+++ b/Sources/SwiftHtml/Tags/Figcaption.swift
@@ -8,7 +8,4 @@
 /// The `<figcaption>` tag defines a caption for a `<figure>` element.
 ///
 /// The `<figcaption>` element can be placed as the first or last child of the `<figure>` element.
-open class Figcaption: Tag {
-    
-    open class override var name: String? { "figcaption" }
-}
+open class Figcaption: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Figure.swift b/Sources/SwiftHtml/Tags/Figure.swift
index 552ceef..0350341 100644
--- a/Sources/SwiftHtml/Tags/Figure.swift
+++ b/Sources/SwiftHtml/Tags/Figure.swift
@@ -10,8 +10,5 @@
 /// While the content of the `<figure>` element is related to the main flow, its position is independent of the main flow, and if removed it should not affect the flow of the document.
 ///
 /// **Tip:** The `<figcaption>` element is used to add a caption for the `<figure>` element.
-open class Figure: Tag {
-
-    open class override var name: String? { "figure" }
-}
+open class Figure: Tag {}
 
diff --git a/Sources/SwiftHtml/Tags/Footer.swift b/Sources/SwiftHtml/Tags/Footer.swift
index 7e89cfc..69fe336 100644
--- a/Sources/SwiftHtml/Tags/Footer.swift
+++ b/Sources/SwiftHtml/Tags/Footer.swift
@@ -16,7 +16,4 @@
 /// - back to top links
 /// - related documents
 /// You can have several `<footer>` elements in one document.
-open class Footer: Tag {
-    
-    open class override var name: String? { "footer" }
-}
+open class Footer: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Form.swift b/Sources/SwiftHtml/Tags/Form.swift
index e3f8631..ae259d5 100644
--- a/Sources/SwiftHtml/Tags/Form.swift
+++ b/Sources/SwiftHtml/Tags/Form.swift
@@ -18,10 +18,7 @@
 /// - `<fieldset>`
 /// - `<label>`
 /// - `<output>`
-open class Form: Tag {
-
-    open class override var name: String? { "form" }
-}
+open class Form: Tag {}
 
 public extension Form {
     
diff --git a/Sources/SwiftHtml/Tags/H1.swift b/Sources/SwiftHtml/Tags/H1.swift
index 466cdf4..d1260f0 100644
--- a/Sources/SwiftHtml/Tags/H1.swift
+++ b/Sources/SwiftHtml/Tags/H1.swift
@@ -11,7 +11,4 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H1: Tag {
-
-    open class override var name: String? { "h1" }
-}
+open class H1: Tag {}
diff --git a/Sources/SwiftHtml/Tags/H2.swift b/Sources/SwiftHtml/Tags/H2.swift
index a63fe7f..d84ce18 100644
--- a/Sources/SwiftHtml/Tags/H2.swift
+++ b/Sources/SwiftHtml/Tags/H2.swift
@@ -11,7 +11,4 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H2: Tag {
-    
-    open class override var name: String? { "h2" }
-}
+open class H2: Tag {}
diff --git a/Sources/SwiftHtml/Tags/H3.swift b/Sources/SwiftHtml/Tags/H3.swift
index 5fae7f2..7cce3ed 100644
--- a/Sources/SwiftHtml/Tags/H3.swift
+++ b/Sources/SwiftHtml/Tags/H3.swift
@@ -11,7 +11,4 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H3: Tag {
-
-    open class override var name: String? { "h3" }
-}
+open class H3: Tag {}
diff --git a/Sources/SwiftHtml/Tags/H4.swift b/Sources/SwiftHtml/Tags/H4.swift
index 1df8582..02705a8 100644
--- a/Sources/SwiftHtml/Tags/H4.swift
+++ b/Sources/SwiftHtml/Tags/H4.swift
@@ -11,7 +11,4 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H4: Tag {
-    
-    open class override var name: String? { "h4" }
-}
+open class H4: Tag {}
diff --git a/Sources/SwiftHtml/Tags/H5.swift b/Sources/SwiftHtml/Tags/H5.swift
index ddc7fc3..a530afd 100644
--- a/Sources/SwiftHtml/Tags/H5.swift
+++ b/Sources/SwiftHtml/Tags/H5.swift
@@ -11,7 +11,4 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H5: Tag {
-    
-    open class override var name: String? { "h5" }
-}
+open class H5: Tag {}
diff --git a/Sources/SwiftHtml/Tags/H6.swift b/Sources/SwiftHtml/Tags/H6.swift
index 735a345..b13151c 100644
--- a/Sources/SwiftHtml/Tags/H6.swift
+++ b/Sources/SwiftHtml/Tags/H6.swift
@@ -11,7 +11,4 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H6: Tag {
-    
-    open class override var name: String? { "h6" }
-}
+open class H6: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index 31114de..b03834f 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -20,7 +20,4 @@
 /// - `<meta>`
 /// - `<script>`
 /// - `<noscript>`
-open class Head: Tag {
-
-    open class override var name: String? { "head" }
-}
+open class Head: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Header.swift b/Sources/SwiftHtml/Tags/Header.swift
index 484e01e..14ca541 100644
--- a/Sources/SwiftHtml/Tags/Header.swift
+++ b/Sources/SwiftHtml/Tags/Header.swift
@@ -13,8 +13,5 @@
 /// - logo or icon
 /// - authorship information
 /// **Note:** You can have several` <header>` elements in one HTML document. However,` <header>` cannot be placed within a` <footer>`,` <address>` or another` <header>` element.
-open class Header: Tag {
-    
-    open class override var name: String? { "header" }
-}
+open class Header: Tag {}
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index bb71b95..e66eed3 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -8,7 +8,4 @@
 /// The `<hr>` tag defines a thematic break in an HTML page (e.g. a shift of topic).
 ///
 /// The `<hr>` element is most often displayed as a horizontal rule that is used to separate content (or define a change) in an HTML page.
-open class Hr: EmptyTag {
-    
-    open class override var name: String? { "hr" }
-}
+open class Hr: EmptyTag {}
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 4214539..b655343 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -10,10 +10,7 @@
 /// The `<html>` tag is the container for all other HTML elements (except for the `<!DOCTYPE>` tag).
 ///
 /// **Note:** You should always include the lang attribute inside the `<html>` tag, to declare the language of the Web page. This is meant to assist search engines and browsers.
-open class Html: Tag {
-
-    open class override var name: String? { "html" }
-}
+open class Html: Tag {}
 
 public extension Html {
     
diff --git a/Sources/SwiftHtml/Tags/I.swift b/Sources/SwiftHtml/Tags/I.swift
index 9406992..c051a17 100644
--- a/Sources/SwiftHtml/Tags/I.swift
+++ b/Sources/SwiftHtml/Tags/I.swift
@@ -16,7 +16,4 @@
 /// - `<mark>` (marked/highlighted text)
 /// - `<cite>` (the title of a work)
 /// - `<dfn>` (a definition term)
-open class I: Tag {
-    
-    open class override var name: String? { "i" }
-}
+open class I: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Iframe.swift b/Sources/SwiftHtml/Tags/Iframe.swift
index 9e954ff..8543d9e 100644
--- a/Sources/SwiftHtml/Tags/Iframe.swift
+++ b/Sources/SwiftHtml/Tags/Iframe.swift
@@ -12,10 +12,7 @@
 /// **Tip:** Use CSS to style the `<iframe>` (see example below).
 ///
 /// **Tip:** It is a good practice to always include a title attribute for the `<iframe>`. This is used by screen readers to read out what the content of the `<iframe>` is.
-open class Iframe: Tag {
-
-    open class override var name: String? { "iframe" }
-}
+open class Iframe: Tag {}
 
 public extension Iframe {
     enum Sandbox {
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index 271f61d..c89579f 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -19,8 +19,6 @@
 ///
 /// **Tip:** To link an image to another document, simply nest the `<img>` tag inside an `<a>` tag (see example below).
 open class Img: EmptyTag {
-    
-    open class override var name: String? { "img" }
 
     public init(src: String, alt: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index 8642ee4..be137e9 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -10,10 +10,7 @@
 /// The `<input>` element is the most important form element.
 ///
 /// The `<input>` element can be displayed in several ways, depending on the type attribute.
-open class Input: EmptyTag {
-
-    open class override var name: String? { "input" }
-}
+open class Input: EmptyTag {}
 
 public extension Input {
     
diff --git a/Sources/SwiftHtml/Tags/Ins.swift b/Sources/SwiftHtml/Tags/Ins.swift
index 54a55c5..f14c159 100644
--- a/Sources/SwiftHtml/Tags/Ins.swift
+++ b/Sources/SwiftHtml/Tags/Ins.swift
@@ -8,7 +8,4 @@
 /// The `<ins>` tag defines a text that has been inserted into a document. Browsers will usually underline inserted text.
 ///
 /// **Tip:** Also look at the `<del>` tag to markup deleted text.
-open class Ins: Tag {
-    
-    open class override var name: String? { "ins" }
-}
+open class Ins: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Kbd.swift b/Sources/SwiftHtml/Tags/Kbd.swift
index 5eac4c0..003d40a 100644
--- a/Sources/SwiftHtml/Tags/Kbd.swift
+++ b/Sources/SwiftHtml/Tags/Kbd.swift
@@ -8,7 +8,4 @@
 /// The `<kbd>` tag is used to define keyboard input. The content inside is displayed in the browser's default monospace font.
 ///
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS (see example below).
-open class Kbd: Tag {
-    
-    open class override var name: String? { "kbd" }
-}
+open class Kbd: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Label.swift b/Sources/SwiftHtml/Tags/Label.swift
index f9f6619..65ace0f 100644
--- a/Sources/SwiftHtml/Tags/Label.swift
+++ b/Sources/SwiftHtml/Tags/Label.swift
@@ -33,10 +33,7 @@
 ///
 /// Screen reader users (will read out loud the label, when the user is focused on the element)
 /// Users who have difficulty clicking on very small regions (such as checkboxes) - because when a user clicks the text within the `<label>` element, it toggles the input (this increases the hit area).
-open class Label: Tag {
-
-    open class override var name: String? { "label" }
-}
+open class Label: Tag {}
 
 public extension Label {
     /// Specifies the id of the form element the label should be bound to
diff --git a/Sources/SwiftHtml/Tags/Legend.swift b/Sources/SwiftHtml/Tags/Legend.swift
index 727d50b..4e5a5f2 100644
--- a/Sources/SwiftHtml/Tags/Legend.swift
+++ b/Sources/SwiftHtml/Tags/Legend.swift
@@ -6,7 +6,4 @@
 //
 
 /// The `<legend>` tag defines a caption for the `<fieldset>` element.
-open class Legend: Tag {
-
-    open class override var name: String? { "legend" }
-}
+open class Legend: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Li.swift b/Sources/SwiftHtml/Tags/Li.swift
index ded078d..518afe7 100644
--- a/Sources/SwiftHtml/Tags/Li.swift
+++ b/Sources/SwiftHtml/Tags/Li.swift
@@ -14,10 +14,7 @@
 /// In `<ol>`, the list items will usually be displayed with numbers or letters.
 ///
 /// **Tip:** Use CSS to style lists.
-open class Li: Tag {
-    
-    open class override var name: String? { "li" }
-}
+open class Li: Tag {}
 
 public extension Li {
     
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index 1fe172e..ff8821b 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -11,8 +11,6 @@
 /// 
 /// The `<link>` element is an empty element, it contains attributes only.
 open class Link: EmptyTag {
-    
-    open class override var name: String? { "link" }
 
     public init(rel: Rel) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/MainTag.swift b/Sources/SwiftHtml/Tags/MainTag.swift
index 359ba21..b1073b9 100644
--- a/Sources/SwiftHtml/Tags/MainTag.swift
+++ b/Sources/SwiftHtml/Tags/MainTag.swift
@@ -10,9 +10,6 @@
 /// The content inside the `<main>` element should be unique to the document. It should not contain any content that is repeated across documents such as sidebars, navigation links, copyright information, site logos, and search forms.
 ///
 /// **Note:** There must not be more than one `<main>` element in a document. The `<main>` element must NOT be a descendant of an `<article>`, `<aside>`, `<footer>`, `<header>`, or `<nav>` element.
-open class Main: Tag {
-    
-    open class override var name: String? { "main" }
-}
+open class Main: Tag {}
 
 
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index 84651c1..9de4d12 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -11,8 +11,6 @@
 ///
 /// The `<map>` element contains a number of `<area>` elements, that defines the clickable areas in the image map.
 open class Map: Tag {
-    
-    open class override var name: String? { "map" }
 
     public init(name: String, @TagBuilder _ builder: () -> [Tag]) {
         super.init(builder())
diff --git a/Sources/SwiftHtml/Tags/Mark.swift b/Sources/SwiftHtml/Tags/Mark.swift
index 5c1d8af..417f5c3 100644
--- a/Sources/SwiftHtml/Tags/Mark.swift
+++ b/Sources/SwiftHtml/Tags/Mark.swift
@@ -6,7 +6,4 @@
 //
 
 /// The `<mark>` tag defines text that should be marked or highlighted.
-open class Mark: Tag {
-    
-    open class override var name: String? { "mark" }
-}
+open class Mark: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index c9b2c4a..99cef99 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -14,10 +14,7 @@
 /// Metadata is used by browsers (how to display content or reload page), search engines (keywords), and other web services.
 ///
 /// There is a method to let web designers take control over the viewport (the user's visible area of a web page), through the `<meta>` tag (See "Setting The Viewport" example below).
-open class Meta: EmptyTag {
-
-    open class override var name: String? { "meta" }
-}
+open class Meta: EmptyTag {}
 
 public extension Meta {
     
diff --git a/Sources/SwiftHtml/Tags/Meter.swift b/Sources/SwiftHtml/Tags/Meter.swift
index 1248b10..8d79638 100644
--- a/Sources/SwiftHtml/Tags/Meter.swift
+++ b/Sources/SwiftHtml/Tags/Meter.swift
@@ -13,8 +13,6 @@
 /// 
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Meter: Tag {
-
-    open class override var name: String? { "meter" }
     
     public init(value: Int, _ contents: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Nav.swift b/Sources/SwiftHtml/Tags/Nav.swift
index 4d0dbe5..6cf7f6c 100644
--- a/Sources/SwiftHtml/Tags/Nav.swift
+++ b/Sources/SwiftHtml/Tags/Nav.swift
@@ -10,10 +10,7 @@
 /// Notice that NOT all links of a document should be inside a `<nav>` element. The `<nav>` element is intended only for major block of navigation links.
 /// 
 /// Browsers, such as screen readers for disabled users, can use this element to determine whether to omit the initial rendering of this content.
-open class Nav: Tag {
-
-    open class override var name: String? { "nav" }
-}
+open class Nav: Tag {}
 
 
 
diff --git a/Sources/SwiftHtml/Tags/Noscript.swift b/Sources/SwiftHtml/Tags/Noscript.swift
index 1a71b93..6454dbb 100644
--- a/Sources/SwiftHtml/Tags/Noscript.swift
+++ b/Sources/SwiftHtml/Tags/Noscript.swift
@@ -8,7 +8,4 @@
 /// The `<noscript>` tag defines an alternate content to be displayed to users that have disabled scripts in their browser or have a browser that doesn't support script.
 /// 
 /// The `<noscript>` element can be used in both `<head>` and `<body>`. When used inside `<head>`, the `<noscript>` element could only contain `<link>`, `<style>`, and `<meta>` elements.
-open class Noscript: Tag {
-
-    open class override var name: String? { "noscript" }
-}
+open class Noscript: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Object.swift b/Sources/SwiftHtml/Tags/Object.swift
index 96ebcef..91429bb 100644
--- a/Sources/SwiftHtml/Tags/Object.swift
+++ b/Sources/SwiftHtml/Tags/Object.swift
@@ -8,10 +8,7 @@
 /// The `<object>` tag defines a container for an external resource.
 ///
 /// The external resource can be a web page, a picture, a media player, or a plug-in application.
-open class Object: Tag {
-    
-    open class override var name: String? { "object" }
-}
+open class Object: Tag {}
 
 public extension Object {
     
diff --git a/Sources/SwiftHtml/Tags/Ol.swift b/Sources/SwiftHtml/Tags/Ol.swift
index 35204e1..63b33cf 100644
--- a/Sources/SwiftHtml/Tags/Ol.swift
+++ b/Sources/SwiftHtml/Tags/Ol.swift
@@ -12,10 +12,7 @@
 /// **Tip:** Use CSS to style lists.
 /// 
 /// **Tip:** For unordered list, use the `<ul>` tag.
-open class Ol: Tag {
-
-    open class override var name: String? { "ol" }
-}
+open class Ol: Tag {}
 
 public extension Ol {
     
diff --git a/Sources/SwiftHtml/Tags/Optgroup.swift b/Sources/SwiftHtml/Tags/Optgroup.swift
index b7e4d3b..eae46b3 100644
--- a/Sources/SwiftHtml/Tags/Optgroup.swift
+++ b/Sources/SwiftHtml/Tags/Optgroup.swift
@@ -8,10 +8,7 @@
 /// The `<optgroup>` tag is used to group related options in a `<select>` element (drop-down list).
 /// 
 /// If you have a long list of options, groups of related options are easier to handle for a user.
-open class Optgroup: Tag {
-    
-    open class override var name: String? { "optgroup" }
-}
+open class Optgroup: Tag {}
 
 public extension Optgroup {
     
diff --git a/Sources/SwiftHtml/Tags/Option.swift b/Sources/SwiftHtml/Tags/Option.swift
index 1e5e53c..beffd4c 100644
--- a/Sources/SwiftHtml/Tags/Option.swift
+++ b/Sources/SwiftHtml/Tags/Option.swift
@@ -12,10 +12,7 @@
 /// **Note:** The `<option>` tag can be used without any attributes, but you usually need the value attribute, which indicates what is sent to the server on form submission.
 /// 
 /// **Tip:** If you have a long list of options, you can group related options within the `<optgroup>` tag.
-open class Option: Tag {
-    
-    open class override var name: String? { "option" }
-}
+open class Option: Tag {}
 
 public extension Option {
     /// Specifies that an option should be disabled
diff --git a/Sources/SwiftHtml/Tags/Output.swift b/Sources/SwiftHtml/Tags/Output.swift
index 055fea1..6fb68aa 100644
--- a/Sources/SwiftHtml/Tags/Output.swift
+++ b/Sources/SwiftHtml/Tags/Output.swift
@@ -6,10 +6,7 @@
 //
 
 /// The `<output>` tag is used to represent the result of a calculation (like one performed by a script).
-open class Output: Tag {
-    
-    open class override var name: String? { "output" }
-}
+open class Output: Tag {}
 
 public extension Output {
     
diff --git a/Sources/SwiftHtml/Tags/P.swift b/Sources/SwiftHtml/Tags/P.swift
index bdadf52..306a2da 100644
--- a/Sources/SwiftHtml/Tags/P.swift
+++ b/Sources/SwiftHtml/Tags/P.swift
@@ -10,7 +10,4 @@
 /// Browsers automatically add a single blank line before and after each `<p>` element.
 /// 
 /// **Tip:** Use CSS to style paragraphs.
-open class P: Tag {
-    
-    open class override var name: String? { "p" }
-}
+open class P: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index 8310639..13258b3 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -6,10 +6,7 @@
 //
 
 /// The `<param>` tag is used to define parameters for an `<object>` element.
-open class Param: EmptyTag {
-
-    open class override var name: String? { "param" }
-}
+open class Param: EmptyTag {}
 
 public extension Param {
     
diff --git a/Sources/SwiftHtml/Tags/Picture.swift b/Sources/SwiftHtml/Tags/Picture.swift
index 38c74c6..85a95dd 100644
--- a/Sources/SwiftHtml/Tags/Picture.swift
+++ b/Sources/SwiftHtml/Tags/Picture.swift
@@ -16,7 +16,4 @@
 /// The `<img>` element is required as the last child of the `<picture>` element, as a fallback option if none of the source tags matches.
 ///
 /// **Tip:** The `<picture>` element works "similar" to `<video>` and `<audio>`. You set up different sources, and the first source that fits the preferences is the one being used.
-open class Picture: Tag {
-    
-    open class override var name: String? { "picture" }
-}
+open class Picture: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Pre.swift b/Sources/SwiftHtml/Tags/Pre.swift
index 439ae77..94e462d 100644
--- a/Sources/SwiftHtml/Tags/Pre.swift
+++ b/Sources/SwiftHtml/Tags/Pre.swift
@@ -9,7 +9,4 @@
 ///
 /// Text in a `<pre>` element is displayed in a fixed-width font, and the text preserves both spaces and line breaks.
 /// The text will be displayed exactly as written in the HTML source code.
-open class Pre: Tag {
-
-    open class override var name: String? { "pre" }
-}
+open class Pre: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Progress.swift b/Sources/SwiftHtml/Tags/Progress.swift
index d222266..426d889 100644
--- a/Sources/SwiftHtml/Tags/Progress.swift
+++ b/Sources/SwiftHtml/Tags/Progress.swift
@@ -8,10 +8,7 @@
 /// The `<progress>` tag represents the completion progress of a task.
 /// 
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Progress: Tag {
-
-    open class override var name: String? { "progress" }
-}
+open class Progress: Tag {}
 
 public extension Progress {
     
diff --git a/Sources/SwiftHtml/Tags/Q.swift b/Sources/SwiftHtml/Tags/Q.swift
index 645d84e..92b0e9a 100644
--- a/Sources/SwiftHtml/Tags/Q.swift
+++ b/Sources/SwiftHtml/Tags/Q.swift
@@ -10,9 +10,7 @@
 /// Browsers normally insert quotation marks around the quotation.
 ///
 /// **Tip:** Use `<blockquote>` for long quotations.
-open class Q: Tag {
-    open class override var name: String? { "q" }
-}
+open class Q: Tag {}
 
 public extension Q {
     
diff --git a/Sources/SwiftHtml/Tags/Rp.swift b/Sources/SwiftHtml/Tags/Rp.swift
index 73a2b44..a1047c5 100644
--- a/Sources/SwiftHtml/Tags/Rp.swift
+++ b/Sources/SwiftHtml/Tags/Rp.swift
@@ -8,7 +8,4 @@
 /// The `<rp>` tag can be used to provide parentheses around a ruby text, to be shown by browsers that do not support ruby annotations.
 ///
 /// Use `<rp>` together with `<ruby>` and `<rt>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
-open class Rp: Tag {
-    
-    open class override var name: String? { "rp" }
-}
+open class Rp: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Rt.swift b/Sources/SwiftHtml/Tags/Rt.swift
index 95c4a4a..a895ad0 100644
--- a/Sources/SwiftHtml/Tags/Rt.swift
+++ b/Sources/SwiftHtml/Tags/Rt.swift
@@ -8,7 +8,4 @@
 /// The `<rt>` tag defines an explanation or pronunciation of characters (for East Asian typography) in a ruby annotation.
 ///
 /// Use `<rt>` together with `<ruby>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
-open class Rt: Tag {
-
-    open class override var name: String? { "rt" }
-}
+open class Rt: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Ruby.swift b/Sources/SwiftHtml/Tags/Ruby.swift
index 34ec5bb..e66e0af 100644
--- a/Sources/SwiftHtml/Tags/Ruby.swift
+++ b/Sources/SwiftHtml/Tags/Ruby.swift
@@ -10,7 +10,4 @@
 /// A ruby annotation is a small extra text, attached to the main text to indicate the pronunciation or meaning of the corresponding characters. This kind of annotation is often used in Japanese publications.
 ///
 /// Use `<ruby>` together with `<rt>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that do not support ruby annotations.
-open class Ruby: Tag {
-    
-    open class override var name: String? { "ruby" }
-}
+open class Ruby: Tag {}
diff --git a/Sources/SwiftHtml/Tags/S.swift b/Sources/SwiftHtml/Tags/S.swift
index caebdee..5b56150 100644
--- a/Sources/SwiftHtml/Tags/S.swift
+++ b/Sources/SwiftHtml/Tags/S.swift
@@ -8,7 +8,4 @@
 /// The `<s>` tag specifies text that is no longer correct, accurate or relevant. The text will be displayed with a line through it.
 ///
 /// The `<s>` tag should not be used to define deleted text in a document, use the `<del>` tag for that.
-open class S: Tag {
-    
-    open class override var name: String? { "s" }
-}
+open class S: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Samp.swift b/Sources/SwiftHtml/Tags/Samp.swift
index ec606ac..fbe4a88 100644
--- a/Sources/SwiftHtml/Tags/Samp.swift
+++ b/Sources/SwiftHtml/Tags/Samp.swift
@@ -8,7 +8,4 @@
 /// The `<samp>` tag is used to define sample output from a computer program. The content inside is displayed in the browser's default monospace font.
 ///
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
-open class Samp: Tag {
-
-    open class override var name: String? { "samp" }
-}
+open class Samp: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Script.swift b/Sources/SwiftHtml/Tags/Script.swift
index 03bf3c2..719eb5c 100644
--- a/Sources/SwiftHtml/Tags/Script.swift
+++ b/Sources/SwiftHtml/Tags/Script.swift
@@ -12,8 +12,6 @@
 /// Common uses for JavaScript are image manipulation, form validation, and dynamic changes of content.
 open class Script: Tag {
     
-    open class override var name: String? { "script" }
-    
     public enum `Type`: String {
         case javascript = "text/javascript"
     }
diff --git a/Sources/SwiftHtml/Tags/Section.swift b/Sources/SwiftHtml/Tags/Section.swift
index 2cc5065..6a3ee7c 100644
--- a/Sources/SwiftHtml/Tags/Section.swift
+++ b/Sources/SwiftHtml/Tags/Section.swift
@@ -6,7 +6,4 @@
 //
 
 /// The `<section>` tag defines a section in a document.
-open class Section: Tag {
-
-    open class override var name: String? { "section" }
-}
+open class Section: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Select.swift b/Sources/SwiftHtml/Tags/Select.swift
index fceba88..84bc5a3 100644
--- a/Sources/SwiftHtml/Tags/Select.swift
+++ b/Sources/SwiftHtml/Tags/Select.swift
@@ -16,10 +16,7 @@
 /// The `<option>` tags inside the `<select>` element define the available options in the drop-down list.
 ///
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Select: Tag {
-    
-    open class override var name: String? { "select" }
-}
+open class Select: Tag {}
 
 public extension Select {
     
diff --git a/Sources/SwiftHtml/Tags/Small.swift b/Sources/SwiftHtml/Tags/Small.swift
index f1cc38f..0bd4db9 100644
--- a/Sources/SwiftHtml/Tags/Small.swift
+++ b/Sources/SwiftHtml/Tags/Small.swift
@@ -8,7 +8,4 @@
 /// The `<small>` tag defines smaller text (like copyright and other side-comments).
 ///
 /// **Tip:** This tag is not deprecated, but it is possible to achieve richer (or the same) effect with CSS.
-open class Small: Tag {
-    
-    open class override var name: String? { "small" }
-}
+open class Small: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index 49c3f93..eae18ad 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -10,10 +10,7 @@
 ///
 /// The `<source>` tag allows you to specify alternative video/audio/image files which the browser may choose from, based on browser support or viewport width.
 /// The browser will choose the first `<source>` it supports.
-open class Source: EmptyTag {
-    
-    open class override var name: String? { "source" }
-}
+open class Source: EmptyTag {}
 
 public extension Source {
     
diff --git a/Sources/SwiftHtml/Tags/Span.swift b/Sources/SwiftHtml/Tags/Span.swift
index 544ee58..2006e94 100644
--- a/Sources/SwiftHtml/Tags/Span.swift
+++ b/Sources/SwiftHtml/Tags/Span.swift
@@ -10,7 +10,4 @@
 /// The `<span>` tag is easily styled by CSS or manipulated with JavaScript using the class or id attribute.
 ///
 /// The `<span>` tag is much like the `<div>` element, but `<div>` is a block-level element and `<span>` is an inline element.
-open class Span: Tag {
-    
-    open class override var name: String? { "span" }
-}
+open class Span: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Strong.swift b/Sources/SwiftHtml/Tags/Strong.swift
index f528229..05e003c 100644
--- a/Sources/SwiftHtml/Tags/Strong.swift
+++ b/Sources/SwiftHtml/Tags/Strong.swift
@@ -8,7 +8,4 @@
 /// The `<strong>` tag is used to define text with strong importance. The content inside is typically displayed in bold.
 ///
 /// **Tip:** Use the `<b>` tag to specify bold text without any extra importance!
-open class Strong: Tag {
-
-    open class override var name: String? { "strong" }
-}
+open class Strong: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Style.swift b/Sources/SwiftHtml/Tags/Style.swift
index c201502..a914afe 100644
--- a/Sources/SwiftHtml/Tags/Style.swift
+++ b/Sources/SwiftHtml/Tags/Style.swift
@@ -9,10 +9,7 @@
 /// The `<style>` tag is used to define style information (CSS) for a document.
 ///
 /// Inside the `<style>` element you specify how HTML elements should render in a browser.
-open class Style: Tag {
-
-    open class override var name: String? { "style" }
-}
+open class Style: Tag {}
 
 public extension Style {
 
diff --git a/Sources/SwiftHtml/Tags/Sub.swift b/Sources/SwiftHtml/Tags/Sub.swift
index ab17f5b..58f382b 100644
--- a/Sources/SwiftHtml/Tags/Sub.swift
+++ b/Sources/SwiftHtml/Tags/Sub.swift
@@ -11,7 +11,4 @@
 /// Subscript text can be used for chemical formulas, like H2O.
 ///
 /// **Tip:** Use the `<sup>` tag to define superscripted text.
-open class Sub: Tag {
-    
-    open class override var name: String? { "sub" }
-}
+open class Sub: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Summary.swift b/Sources/SwiftHtml/Tags/Summary.swift
index af15b16..0452318 100644
--- a/Sources/SwiftHtml/Tags/Summary.swift
+++ b/Sources/SwiftHtml/Tags/Summary.swift
@@ -8,7 +8,4 @@
 /// The `<summary>` tag defines a visible heading for the `<details>` element. The heading can be clicked to view/hide the details.
 ///
 /// **Note:** The `<summary>` element should be the first child element of the `<details>` element.
-open class Summary: Tag {
-    
-    open class override var name: String? { "summary" }
-}
+open class Summary: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Sup.swift b/Sources/SwiftHtml/Tags/Sup.swift
index 5da017e..b6aceac 100644
--- a/Sources/SwiftHtml/Tags/Sup.swift
+++ b/Sources/SwiftHtml/Tags/Sup.swift
@@ -11,7 +11,4 @@
 /// Superscript text can be used for footnotes, like WWW[1].
 ///
 /// **Tip:** Use the `<sub>` tag to define subscript text.
-open class Sup: Tag {
-    
-    open class override var name: String? { "sup" }
-}
+open class Sup: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Table.swift b/Sources/SwiftHtml/Tags/Table.swift
index c701c98..22d9d5e 100644
--- a/Sources/SwiftHtml/Tags/Table.swift
+++ b/Sources/SwiftHtml/Tags/Table.swift
@@ -12,7 +12,4 @@
 /// The `<tr>` element defines a table row, the `<th>` element defines a table header, and the `<td>` element defines a table cell.
 /// 
 /// An HTML table may also include `<caption>`, `<colgroup>`, `<thead>`, `<tfoot>`, and `<tbody>` elements.
-open class Table: Tag {
-
-    open class override var name: String? { "table" }
-}
+open class Table: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Tbody.swift b/Sources/SwiftHtml/Tags/Tbody.swift
index a335cdf..7f8eeb3 100644
--- a/Sources/SwiftHtml/Tags/Tbody.swift
+++ b/Sources/SwiftHtml/Tags/Tbody.swift
@@ -17,8 +17,5 @@
 /// The `<tbody>` tag must be used in the following context: As a child of a `<table>` element, after any `<caption>`, `<colgroup>`, and `<thead>` elements.
 ///
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
-open class Tbody: Tag {
-    
-    open class override var name: String? { "tbody" }
-}
+open class Tbody: Tag {}
 
diff --git a/Sources/SwiftHtml/Tags/Td.swift b/Sources/SwiftHtml/Tags/Td.swift
index 4387ba0..bb196a6 100644
--- a/Sources/SwiftHtml/Tags/Td.swift
+++ b/Sources/SwiftHtml/Tags/Td.swift
@@ -15,10 +15,7 @@
 /// The text in `<td>` elements are regular and left-aligned by default.
 ///
 /// The text in `<th>` elements are bold and centered by default.
-open class Td: Tag {
-
-    open class override var name: String? { "td" }
-}
+open class Td: Tag {}
 
 public extension Td {
     
diff --git a/Sources/SwiftHtml/Tags/Template.swift b/Sources/SwiftHtml/Tags/Template.swift
index c308aea..1f2dd70 100644
--- a/Sources/SwiftHtml/Tags/Template.swift
+++ b/Sources/SwiftHtml/Tags/Template.swift
@@ -11,10 +11,7 @@
 ///
 /// You can use the `<template>` tag if you have some HTML code you want to use over and over again, but not until you ask for it.
 /// To do this without the `<template>` tag, you have to create the HTML code with JavaScript to prevent the browser from rendering the code.
-open class Template: Tag {
-
-    open class override var name: String? { "template" }
-}
+open class Template: Tag {}
 
 
 
diff --git a/Sources/SwiftHtml/Tags/Textarea.swift b/Sources/SwiftHtml/Tags/Textarea.swift
index a9a5d0c..03e8649 100644
--- a/Sources/SwiftHtml/Tags/Textarea.swift
+++ b/Sources/SwiftHtml/Tags/Textarea.swift
@@ -18,10 +18,7 @@
 /// The id attribute is needed to associate the text area with a label.
 ///
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Textarea: Tag {
-
-    open class override var name: String? { "textarea" }
-}
+open class Textarea: Tag {}
 
 public extension Textarea {
     
diff --git a/Sources/SwiftHtml/Tags/Tfoot.swift b/Sources/SwiftHtml/Tags/Tfoot.swift
index 6764a55..fee9460 100644
--- a/Sources/SwiftHtml/Tags/Tfoot.swift
+++ b/Sources/SwiftHtml/Tags/Tfoot.swift
@@ -17,7 +17,4 @@
 /// The `<tfoot>` tag must be used in the following context: As a child of a <table> element, after any `<caption>`, `<colgroup>`, `<thead>`, and `<tbody>` elements.
 ///
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
-open class Tfoot: Tag {
-
-    open class override var name: String? { "tfoot" }
-}
+open class Tfoot: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Th.swift b/Sources/SwiftHtml/Tags/Th.swift
index 290af62..848eb62 100644
--- a/Sources/SwiftHtml/Tags/Th.swift
+++ b/Sources/SwiftHtml/Tags/Th.swift
@@ -15,10 +15,7 @@
 /// The text in `<th>` elements are bold and centered by default.
 ///
 /// The text in `<td>` elements are regular and left-aligned by default.
-open class Th: Tag {
-    
-    open class override var name: String? { "th" }
-}
+open class Th: Tag {}
 
 public extension Th {
     
diff --git a/Sources/SwiftHtml/Tags/Thead.swift b/Sources/SwiftHtml/Tags/Thead.swift
index 3f4e367..09445f3 100644
--- a/Sources/SwiftHtml/Tags/Thead.swift
+++ b/Sources/SwiftHtml/Tags/Thead.swift
@@ -17,7 +17,4 @@
 /// The `<thead>` tag must be used in the following context: As a child of a `<table>` element, after any `<caption>` and `<colgroup>` elements, and before any `<tbody>`, `<tfoot>`, and `<tr>` elements.
 ///
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
-open class Thead: Tag {
-
-    open class override var name: String? { "thead" }
-}
+open class Thead: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Time.swift b/Sources/SwiftHtml/Tags/Time.swift
index d4644ae..9333677 100644
--- a/Sources/SwiftHtml/Tags/Time.swift
+++ b/Sources/SwiftHtml/Tags/Time.swift
@@ -8,10 +8,7 @@
 /// The `<time>` tag defines a specific time (or datetime).
 ///
 /// The datetime attribute of this element is used translate the time into a machine-readable format so that browsers can offer to add date reminders through the user's calendar, and search engines can produce smarter search results.
-open class Time: Tag {
-
-    open class override var name: String? { "time" }
-}
+open class Time: Tag {}
 
 public extension Time {
     
diff --git a/Sources/SwiftHtml/Tags/Title.swift b/Sources/SwiftHtml/Tags/Title.swift
index 59397c6..31de602 100644
--- a/Sources/SwiftHtml/Tags/Title.swift
+++ b/Sources/SwiftHtml/Tags/Title.swift
@@ -26,7 +26,4 @@
 /// So, try to make the title as accurate and meaningful as possible!
 ///
 /// **Note:** You can NOT have more than one `<title>` element in an HTML document.
-open class Title: Tag {
-
-    open class override var name: String? { "title" }
-}
+open class Title: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Tr.swift b/Sources/SwiftHtml/Tags/Tr.swift
index f7956b9..cc58fc6 100644
--- a/Sources/SwiftHtml/Tags/Tr.swift
+++ b/Sources/SwiftHtml/Tags/Tr.swift
@@ -8,7 +8,4 @@
 /// The `<tr>` tag defines a row in an HTML table.
 ///
 /// A `<tr>` element contains one or more `<th>` or `<td>` elements.
-open class Tr: Tag {
-
-    open class override var name: String? { "tr" }
-}
+open class Tr: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index 51469df..22aa8f6 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -12,8 +12,6 @@
 /// Tracks are formatted in WebVTT format (.vtt files).
 open class Track: EmptyTag {
     
-    open class override var name: String? { "track" }
-    
     public init(src: String) {
         super.init()
         setAttributes([
diff --git a/Sources/SwiftHtml/Tags/U.swift b/Sources/SwiftHtml/Tags/U.swift
index 75c7c19..e7814c5 100644
--- a/Sources/SwiftHtml/Tags/U.swift
+++ b/Sources/SwiftHtml/Tags/U.swift
@@ -11,7 +11,4 @@
 /// You can change this with CSS (see example below).
 ///
 /// **Tip:** Avoid using the `<u>` element where it could be confused for a hyperlink!
-open class U: Tag {
-
-    open class override var name: String? { "u" }
-}
+open class U: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Ul.swift b/Sources/SwiftHtml/Tags/Ul.swift
index 1b0bcca..a37faf3 100644
--- a/Sources/SwiftHtml/Tags/Ul.swift
+++ b/Sources/SwiftHtml/Tags/Ul.swift
@@ -12,7 +12,4 @@
 /// **Tip:** Use CSS to style lists.
 /// 
 /// **Tip:** For ordered lists, use the `<ol>` tag.
-open class Ul: Tag {
-
-    open class override var name: String? { "ul" }
-}
+open class Ul: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Var.swift b/Sources/SwiftHtml/Tags/Var.swift
index 11b6410..e81889f 100644
--- a/Sources/SwiftHtml/Tags/Var.swift
+++ b/Sources/SwiftHtml/Tags/Var.swift
@@ -8,7 +8,4 @@
 /// The `<var>` tag is used to defines a variable in programming or in a mathematical expression. The content inside is typically displayed in italic.
 /// 
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
-open class Var: Tag {
-
-    open class override var name: String? { "var" }
-}
+open class Var: Tag {}
diff --git a/Sources/SwiftHtml/Tags/Video.swift b/Sources/SwiftHtml/Tags/Video.swift
index 0d79760..4937225 100644
--- a/Sources/SwiftHtml/Tags/Video.swift
+++ b/Sources/SwiftHtml/Tags/Video.swift
@@ -20,10 +20,7 @@
 ///     Firefox | YES | YES  | YES
 ///     Safari  | YES | YES  | NO
 ///     Opera   | YES | YES  | YES
-open class Video: Tag {
-
-    open class override var name: String? { "video" }
-}
+open class Video: Tag {}
 
 public extension Video {
     
diff --git a/Sources/SwiftHtml/Tags/Wbr.swift b/Sources/SwiftHtml/Tags/Wbr.swift
index ac57b35..70d8802 100644
--- a/Sources/SwiftHtml/Tags/Wbr.swift
+++ b/Sources/SwiftHtml/Tags/Wbr.swift
@@ -8,7 +8,4 @@
 /// The `<wbr>` (Word Break Opportunity) tag specifies where in a text it would be ok to add a line-break.
 ///
 /// **Tip:** When a word is too long, the browser might break it at the wrong place. You can use the `<wbr>` element to add word break opportunities.
-open class Wbr: Tag {
-
-    open class override var name: String? { "wbr" }
-}
+open class Wbr: Tag {}
diff --git a/Sources/SwiftRss/LastBuildDate.swift b/Sources/SwiftRss/LastBuildDate.swift
index c5eb9e2..28ffbd9 100644
--- a/Sources/SwiftRss/LastBuildDate.swift
+++ b/Sources/SwiftRss/LastBuildDate.swift
@@ -6,7 +6,4 @@
 //
 
 
-open class LastBuildDate: Tag {
-    
-    open class override var name: String? { "lastBuildDate" }
-}
+open class LastBuildDate: Tag {}
diff --git a/Sources/SwiftRss/PubDate.swift b/Sources/SwiftRss/PubDate.swift
index d826191..627d286 100644
--- a/Sources/SwiftRss/PubDate.swift
+++ b/Sources/SwiftRss/PubDate.swift
@@ -5,7 +5,4 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class PubDate: Tag {
-    
-    open class override var name: String? { "pubDate" }    
-}
+open class PubDate: Tag {}
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index cea900b..097b10f 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -7,7 +7,7 @@
 
 open class EmptyTag: Tag {
 
-    open class override var type: Node.NodeType { .empty }
+//    open class override var type: Node.NodeType { .empty }
     
     public init() {
         super.init()
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index 9bc6b78..c4ec2f9 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -6,9 +6,4 @@
 //
 
 
-open class GroupTag: Tag {
-    
-    open class override var name: String? { nil }
-
-    open class override var type: Node.NodeType { .group }
-}
+open class GroupTag: Tag {}
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 36a1b81..92797fe 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -12,44 +12,71 @@ open class Tag {
     
     // MARK: - init
     
-    open class var name: String? { String(describing: self) }
+//    open class var name: String? { String(describing: self) }
     
-    open class var type: Node.NodeType { .standard }
+//    open class var type: Node.NodeType { .standard }
 
-    open class func createNode(_ type: Node.NodeType, _ name: String?) -> Node {
-        Node(type: type, name: name)
+//    open class func createNode(_ type: Node.NodeType, _ name: String?) -> Node {
+//        Node(type: type, name: name)
+//    }
+    
+    open class func createNode() -> Node {
+        Node(type: .standard, name: String(describing: self).lowercased())
     }
-
+    
     /// initialize a new Tag with child tags
-    public init(name: String? = nil, type: Node.NodeType? = nil, _ children: [Tag] = []) {
-        let name = name ?? Self.name
-        self.node = Self.createNode(type ?? Self.type, name?.lowercased())
+    public init(node: Node? = nil, _ children: [Tag] = []) {
+        self.node = node ?? Self.createNode()
         self.children = children
     }
 
     /// initialize a new Tag with a single child tag
-    public convenience init(name: String? = nil, type: Node.NodeType? = nil, _ child: Tag) {
-        self.init(name: name, type: type, [child])
+    public convenience init(_ child: Tag) {
+        self.init([child])
     }
 
     /// initialize a new Tag with children using a builder
-    public convenience init(name: String? = nil, type: Node.NodeType? = nil, @TagBuilder _ builder: () -> [Tag]) {
-        self.init(name: name, type: type, builder())
+    public convenience init(@TagBuilder _ builder: () -> Tag) {
+        self.init([builder()])
     }
-   
-//    /// initialize a new Tag with children using an async throwing builder
-//    public convenience init(@TagBuilder _ builder: () async throws -> [Tag]) async throws {
-//        self.init(try await builder())
+    
+//    public convenience init(@TagBuilder builders: () -> [Tag]) {
+//        self.init(builders())
 //    }
 
     /// initialize a new Tag with some contents
-    public convenience init(name: String? = nil, type: Node.NodeType? = nil, _ contents: String?) {
-        self.init(name: name, type: type)
+    public convenience init(_ contents: String?) {
+        self.init()
         if let contents = contents {
             setContents(contents)
         }
     }
 
+//    /// initialize a new Tag with child tags
+//    public init(name: String? = nil, type: Node.NodeType? = nil, _ children: [Tag] = []) {
+//        let name = name ?? Self.name
+//        self.node = Self.createNode(type ?? Self.type, name?.lowercased())
+//        self.children = children
+//    }
+//
+//    /// initialize a new Tag with a single child tag
+//    public convenience init(name: String? = nil, type: Node.NodeType? = nil, _ child: Tag) {
+//        self.init(name: name, type: type, [child])
+//    }
+//
+//    /// initialize a new Tag with children using a builder
+//    public convenience init(name: String? = nil, type: Node.NodeType? = nil, @TagBuilder _ builder: () -> [Tag]) {
+//        self.init(name: name, type: type, builder())
+//    }
+//   
+//    /// initialize a new Tag with some contents
+//    public convenience init(name: String? = nil, type: Node.NodeType? = nil, _ contents: String?) {
+//        self.init(name: name, type: type)
+//        if let contents = contents {
+//            setContents(contents)
+//        }
+//    }
+
     // MARK: - contents
     
     /// set contents

From db074151155fc8621a0b5d63141fbd5cce4f6998 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 6 Jul 2023 17:08:01 -0400
Subject: [PATCH 008/141] Reverting to init with optional Node

---
 Sources/SwiftSgml/Tag.swift        | 37 ---------------
 Sources/SwiftSgml/TagBuilder.swift | 74 ++++++++++++++++++++----------
 2 files changed, 51 insertions(+), 60 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 92797fe..04160ee 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -12,14 +12,6 @@ open class Tag {
     
     // MARK: - init
     
-//    open class var name: String? { String(describing: self) }
-    
-//    open class var type: Node.NodeType { .standard }
-
-//    open class func createNode(_ type: Node.NodeType, _ name: String?) -> Node {
-//        Node(type: type, name: name)
-//    }
-    
     open class func createNode() -> Node {
         Node(type: .standard, name: String(describing: self).lowercased())
     }
@@ -40,10 +32,6 @@ open class Tag {
         self.init([builder()])
     }
     
-//    public convenience init(@TagBuilder builders: () -> [Tag]) {
-//        self.init(builders())
-//    }
-
     /// initialize a new Tag with some contents
     public convenience init(_ contents: String?) {
         self.init()
@@ -52,31 +40,6 @@ open class Tag {
         }
     }
 
-//    /// initialize a new Tag with child tags
-//    public init(name: String? = nil, type: Node.NodeType? = nil, _ children: [Tag] = []) {
-//        let name = name ?? Self.name
-//        self.node = Self.createNode(type ?? Self.type, name?.lowercased())
-//        self.children = children
-//    }
-//
-//    /// initialize a new Tag with a single child tag
-//    public convenience init(name: String? = nil, type: Node.NodeType? = nil, _ child: Tag) {
-//        self.init(name: name, type: type, [child])
-//    }
-//
-//    /// initialize a new Tag with children using a builder
-//    public convenience init(name: String? = nil, type: Node.NodeType? = nil, @TagBuilder _ builder: () -> [Tag]) {
-//        self.init(name: name, type: type, builder())
-//    }
-//   
-//    /// initialize a new Tag with some contents
-//    public convenience init(name: String? = nil, type: Node.NodeType? = nil, _ contents: String?) {
-//        self.init(name: name, type: type)
-//        if let contents = contents {
-//            setContents(contents)
-//        }
-//    }
-
     // MARK: - contents
     
     /// set contents
diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index 141c320..38e2396 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -8,40 +8,68 @@
 @resultBuilder
 public enum TagBuilder {
     
-    public static func buildBlock(_ components: [Tag]...) -> [Tag] {
-        components.flatMap { $0 }
-    }
-    
     public static func buildBlock(_ components: [Tag]...) -> Tag {
-        let flat = components.flatMap { $0 }
-        if flat.count < 2, let first = flat.first {
-            return first
-        }
-        return GroupTag(flat)
+        GroupTag(components.flatMap { $0 })
     }
-
-    public static func buildExpression(_ expression: [Tag]) -> [Tag] {
-        expression
+    
+    public static func buildBlock(_ components: Tag...) -> Tag {
+        GroupTag(components)
     }
     
-    public static func buildExpression(_ expression: Tag) -> [Tag] {
-        [expression]
+    public static func buildOptional(_ component: Tag?) -> Tag {
+        component ?? GroupTag()
     }
-
-    public static func buildEither(first component: [Tag]) -> [Tag] {
+    
+    public static func buildEither(first component: Tag) -> Tag {
         component
     }
 
-    public static func buildEither(second component: [Tag]) -> [Tag] {
+    public static func buildEither(second component: Tag) -> Tag {
         component
     }
     
-    public static func buildOptional(_ component: [Tag]?) -> [Tag] {
-        component ?? []
-    }
-    
-    public static func buildArray(_ components: [[Tag]]) -> [Tag] {
-        components.flatMap { $0 }
+    public static func buildArray(_ components: [Tag]) -> Tag {
+        GroupTag(components)
     }
 }
 
+//@resultBuilder
+//public enum TagBuilder {
+//
+//    public static func buildBlock(_ components: [Tag]...) -> [Tag] {
+//        components.flatMap { $0 }
+//    }
+//
+//    public static func buildBlock(_ components: [Tag]...) -> Tag {
+//        let flat = components.flatMap { $0 }
+//        if flat.count < 2, let first = flat.first {
+//            return first
+//        }
+//        return GroupTag(flat)
+//    }
+//
+//    public static func buildExpression(_ expression: [Tag]) -> [Tag] {
+//        expression
+//    }
+//
+//    public static func buildExpression(_ expression: Tag) -> [Tag] {
+//        [expression]
+//    }
+//
+//    public static func buildEither(first component: [Tag]) -> [Tag] {
+//        component
+//    }
+//
+//    public static func buildEither(second component: [Tag]) -> [Tag] {
+//        component
+//    }
+//
+//    public static func buildOptional(_ component: [Tag]?) -> [Tag] {
+//        component ?? []
+//    }
+//
+//    public static func buildArray(_ components: [[Tag]]) -> [Tag] {
+//        components.flatMap { $0 }
+//    }
+//}
+

From 677973dbf268cfec2ad28ff3ee830000f735be5a Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 6 Jul 2023 17:24:41 -0400
Subject: [PATCH 009/141] Reverting to init with optional Node

---
 Sources/SwiftSgml/EmptyTag.swift | 8 +++++---
 Sources/SwiftSgml/GroupTag.swift | 9 +++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index 097b10f..d4f5c07 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -1,14 +1,16 @@
 //
-//  File.swift
+//  EmptyTag.swift
 //  
 //
 //  Created by Tibor Bodecs on 2022. 02. 11..
 //
 
 open class EmptyTag: Tag {
-
-//    open class override var type: Node.NodeType { .empty }
     
+    open override class func createNode() -> Node {
+        Node(type: .empty, name: String(describing: self).lowercased())
+    }
+
     public init() {
         super.init()
     }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index c4ec2f9..6a14aa7 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -1,9 +1,14 @@
 //
-//  File.swift
+//  GroupTag.swift
 //  
 //
 //  Created by Tibor Bodecs on 2022. 02. 11..
 //
 
 
-open class GroupTag: Tag {}
+open class GroupTag: Tag {
+
+    open override class func createNode() -> Node {
+        .init(type: .group)
+    }
+}

From ee7d3dfb367ed3bf441193f9b21bd9c54918a6e2 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 6 Jul 2023 18:01:38 -0400
Subject: [PATCH 010/141] Reverting to init with optional Node

---
 Sources/SwiftSgml/TagBuilder.swift | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index 38e2396..fdc72d0 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -11,15 +11,15 @@ public enum TagBuilder {
     public static func buildBlock(_ components: [Tag]...) -> Tag {
         GroupTag(components.flatMap { $0 })
     }
-    
+
     public static func buildBlock(_ components: Tag...) -> Tag {
         GroupTag(components)
     }
-    
+
     public static func buildOptional(_ component: Tag?) -> Tag {
         component ?? GroupTag()
     }
-    
+
     public static func buildEither(first component: Tag) -> Tag {
         component
     }
@@ -27,10 +27,14 @@ public enum TagBuilder {
     public static func buildEither(second component: Tag) -> Tag {
         component
     }
-    
+
     public static func buildArray(_ components: [Tag]) -> Tag {
         GroupTag(components)
     }
+    
+    public static func buildArray(_ components: [[Tag]]) -> Tag {
+        GroupTag(components.flatMap { $0 })
+    }
 }
 
 //@resultBuilder
@@ -72,4 +76,4 @@ public enum TagBuilder {
 //        components.flatMap { $0 }
 //    }
 //}
-
+//

From cb0eada6cc1db9eb78f9047157af408f00d616e0 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 6 Jul 2023 18:18:11 -0400
Subject: [PATCH 011/141] Reverting to init with optional Node

---
 Sources/SwiftSgml/TagBuilder.swift | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index fdc72d0..2aab93e 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -8,26 +8,30 @@
 @resultBuilder
 public enum TagBuilder {
     
+    public static func buildBlock(_ components: [Tag]...) -> [Tag] {
+        components.flatMap { $0 }
+    }
+    
     public static func buildBlock(_ components: [Tag]...) -> Tag {
         GroupTag(components.flatMap { $0 })
     }
-
+    
     public static func buildBlock(_ components: Tag...) -> Tag {
         GroupTag(components)
     }
-
+    
     public static func buildOptional(_ component: Tag?) -> Tag {
         component ?? GroupTag()
     }
-
+    
     public static func buildEither(first component: Tag) -> Tag {
         component
     }
-
+    
     public static func buildEither(second component: Tag) -> Tag {
         component
     }
-
+    
     public static func buildArray(_ components: [Tag]) -> Tag {
         GroupTag(components)
     }

From 98132f0d386829189ba5736468502effdec9fbe2 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 7 Jul 2023 07:14:40 -0400
Subject: [PATCH 012/141] TagBuilder fixes

---
 Sources/SwiftSgml/TagBuilder.swift | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index 2aab93e..625c1ff 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -8,10 +8,6 @@
 @resultBuilder
 public enum TagBuilder {
     
-    public static func buildBlock(_ components: [Tag]...) -> [Tag] {
-        components.flatMap { $0 }
-    }
-    
     public static func buildBlock(_ components: [Tag]...) -> Tag {
         GroupTag(components.flatMap { $0 })
     }
@@ -20,6 +16,10 @@ public enum TagBuilder {
         GroupTag(components)
     }
     
+    public static func buildExpression(_ expression: Tag) -> [Tag] {
+        [expression]
+    }
+    
     public static func buildOptional(_ component: Tag?) -> Tag {
         component ?? GroupTag()
     }
@@ -27,7 +27,7 @@ public enum TagBuilder {
     public static func buildEither(first component: Tag) -> Tag {
         component
     }
-    
+
     public static func buildEither(second component: Tag) -> Tag {
         component
     }
@@ -35,12 +35,9 @@ public enum TagBuilder {
     public static func buildArray(_ components: [Tag]) -> Tag {
         GroupTag(components)
     }
-    
-    public static func buildArray(_ components: [[Tag]]) -> Tag {
-        GroupTag(components.flatMap { $0 })
-    }
 }
 
+
 //@resultBuilder
 //public enum TagBuilder {
 //

From 0000a66256900fbacd24d1ce92b6ce34d187c8fd Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 7 Jul 2023 10:07:39 -0400
Subject: [PATCH 013/141] Empty resultBuilder

---
 Sources/SwiftSgml/TagBuilder.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index 704a3a2..91947e9 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -7,6 +7,10 @@
 
 @resultBuilder
 public enum TagBuilder {
+
+    public static func buildBlock() -> Tag {
+        GroupTag()
+    }
     
     public static func buildBlock(_ components: [Tag]...) -> Tag {
         GroupTag(components.flatMap { $0 })

From 80851655c7e5ee8c8cc5140d9811727f1984f2a4 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 7 Jul 2023 10:21:18 -0400
Subject: [PATCH 014/141] Fixing stuff

---
 Sources/SwiftSgml/TagBuilder.swift | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index 9bc3c06..fae87a6 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -20,10 +20,6 @@ public enum TagBuilder {
         GroupTag(components)
     }
     
-    public static func buildExpression(_ expression: Tag) -> [Tag] {
-        [expression]
-    }
-    
     public static func buildOptional(_ component: Tag?) -> Tag {
         component ?? GroupTag()
     }

From 63cd7f652186432dd4899e3ebb817844f94e7573 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 7 Jul 2023 10:28:24 -0400
Subject: [PATCH 015/141] Testing

---
 Sources/SwiftSgml/TagBuilder.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index fae87a6..f898667 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -8,9 +8,9 @@
 @resultBuilder
 public enum TagBuilder {
 
-    public static func buildBlock() -> Tag {
-        GroupTag()
-    }
+//    public static func buildBlock() -> Tag {
+//        GroupTag()
+//    }
     
     public static func buildBlock(_ components: [Tag]...) -> Tag {
         GroupTag(components.flatMap { $0 })

From d103f7fea52ea99aa9ee18667c7efd57bb40cbcc Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 7 Jul 2023 10:37:38 -0400
Subject: [PATCH 016/141] Empty buildBlock

---
 Sources/SwiftSgml/TagBuilder.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index f898667..fae87a6 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -8,9 +8,9 @@
 @resultBuilder
 public enum TagBuilder {
 
-//    public static func buildBlock() -> Tag {
-//        GroupTag()
-//    }
+    public static func buildBlock() -> Tag {
+        GroupTag()
+    }
     
     public static func buildBlock(_ components: [Tag]...) -> Tag {
         GroupTag(components.flatMap { $0 })

From a897e29c4e0086dca12ba01445f5fb151ced6a0f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 7 Jul 2023 10:46:27 -0400
Subject: [PATCH 017/141] init Tag with optional Node

---
 Sources/SwiftSgml/Tag.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 04160ee..4aa1021 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -23,13 +23,13 @@ open class Tag {
     }
 
     /// initialize a new Tag with a single child tag
-    public convenience init(_ child: Tag) {
-        self.init([child])
+    public convenience init(node: Node? = nil, _ child: Tag) {
+        self.init(node: node, [child])
     }
 
     /// initialize a new Tag with children using a builder
-    public convenience init(@TagBuilder _ builder: () -> Tag) {
-        self.init([builder()])
+    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
+        self.init(node: node, [builder()])
     }
     
     /// initialize a new Tag with some contents

From 60563e0126dc7cefbe6d3a6106948c3141c748eb Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 7 Jul 2023 10:46:27 -0400
Subject: [PATCH 018/141] init Tag with optional Node

---
 Sources/SwiftSgml/Tag.swift | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 04160ee..3308426 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -23,18 +23,18 @@ open class Tag {
     }
 
     /// initialize a new Tag with a single child tag
-    public convenience init(_ child: Tag) {
-        self.init([child])
+    public convenience init(node: Node? = nil, _ child: Tag) {
+        self.init(node: node, [child])
     }
 
     /// initialize a new Tag with children using a builder
-    public convenience init(@TagBuilder _ builder: () -> Tag) {
-        self.init([builder()])
+    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
+        self.init(node: node, [builder()])
     }
     
     /// initialize a new Tag with some contents
-    public convenience init(_ contents: String?) {
-        self.init()
+    public convenience init(node: Node? = nil, _ contents: String?) {
+        self.init(node: node)
         if let contents = contents {
             setContents(contents)
         }

From 2f5fc7a6dec6d6303fa673c7db90c1a483c5fc87 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sat, 8 Jul 2023 10:54:43 -0400
Subject: [PATCH 019/141] Make TagBuilder convenience initializer a second
 designated initializer

---
 Sources/SwiftSgml/Tag.swift | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 3308426..2d9dbab 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -22,19 +22,20 @@ open class Tag {
         self.children = children
     }
 
-    /// initialize a new Tag with a single child tag
-    public convenience init(node: Node? = nil, _ child: Tag) {
-        self.init(node: node, [child])
-    }
-
     /// initialize a new Tag with children using a builder
-    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
-        self.init(node: node, [builder()])
+    public init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
+        self.node = node ?? Self.createNode()
+        self.children = [builder()]
     }
     
+    /// initialize a new Tag with a single child tag
+    public convenience init(_ child: Tag) {
+        self.init([child])
+    }
+
     /// initialize a new Tag with some contents
-    public convenience init(node: Node? = nil, _ contents: String?) {
-        self.init(node: node)
+    public convenience init(_ contents: String?) {
+        self.init()
         if let contents = contents {
             setContents(contents)
         }

From 64a555162c13a67ea66e576de07d8b9efcb51933 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sat, 8 Jul 2023 11:04:57 -0400
Subject: [PATCH 020/141] Remove TagBuilder designated initializer. Causes
 problems.

---
 Sources/SwiftSgml/Tag.swift | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 2d9dbab..04160ee 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -22,17 +22,16 @@ open class Tag {
         self.children = children
     }
 
-    /// initialize a new Tag with children using a builder
-    public init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
-        self.node = node ?? Self.createNode()
-        self.children = [builder()]
-    }
-    
     /// initialize a new Tag with a single child tag
     public convenience init(_ child: Tag) {
         self.init([child])
     }
 
+    /// initialize a new Tag with children using a builder
+    public convenience init(@TagBuilder _ builder: () -> Tag) {
+        self.init([builder()])
+    }
+    
     /// initialize a new Tag with some contents
     public convenience init(_ contents: String?) {
         self.init()

From 043878da1c1e6481bf49b2e6d3668c76015fff4b Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sat, 8 Jul 2023 16:25:31 -0400
Subject: [PATCH 021/141] Subclasses of primary Tags maintain html nam

---
 Sources/SwiftHtml/Tags/A.swift          | 5 ++++-
 Sources/SwiftHtml/Tags/Abbr.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Address.swift    | 5 ++++-
 Sources/SwiftHtml/Tags/Area.swift       | 2 ++
 Sources/SwiftHtml/Tags/Article.swift    | 5 ++++-
 Sources/SwiftHtml/Tags/Aside.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Audio.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/B.swift          | 5 ++++-
 Sources/SwiftHtml/Tags/Base.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Bdi.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Bdo.swift        | 2 ++
 Sources/SwiftHtml/Tags/Blockquote.swift | 5 ++++-
 Sources/SwiftHtml/Tags/Body.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Br.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Button.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Canvas.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Caption.swift    | 5 ++++-
 Sources/SwiftHtml/Tags/Cite.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Code.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Col.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Colgroup.swift   | 5 ++++-
 Sources/SwiftHtml/Tags/Comment.swift    | 2 ++
 Sources/SwiftHtml/Tags/Data.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Datalist.swift   | 5 ++++-
 Sources/SwiftHtml/Tags/Dd.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Del.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Details.swift    | 5 ++++-
 Sources/SwiftHtml/Tags/Dfn.swift        | 1 +
 Sources/SwiftHtml/Tags/Dialog.swift     | 1 +
 Sources/SwiftHtml/Tags/Div.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Dl.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Dt.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Em.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Embed.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Fieldset.swift   | 5 ++++-
 Sources/SwiftHtml/Tags/Figcaption.swift | 5 ++++-
 Sources/SwiftHtml/Tags/Figure.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Footer.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Form.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/H1.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/H2.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/H3.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/H4.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/H5.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/H6.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Head.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Header.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Hr.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Html.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/I.swift          | 5 ++++-
 Sources/SwiftHtml/Tags/Iframe.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Img.swift        | 2 ++
 Sources/SwiftHtml/Tags/Input.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Ins.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Kbd.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Label.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Legend.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Li.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Link.swift       | 2 ++
 Sources/SwiftHtml/Tags/MainTag.swift    | 5 ++++-
 Sources/SwiftHtml/Tags/Map.swift        | 2 ++
 Sources/SwiftHtml/Tags/Mark.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Meta.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Meter.swift      | 2 ++
 Sources/SwiftHtml/Tags/Nav.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Noscript.swift   | 5 ++++-
 Sources/SwiftHtml/Tags/Object.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Ol.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Optgroup.swift   | 5 ++++-
 Sources/SwiftHtml/Tags/Option.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Output.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/P.swift          | 5 ++++-
 Sources/SwiftHtml/Tags/Param.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Picture.swift    | 5 ++++-
 Sources/SwiftHtml/Tags/Pre.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Progress.swift   | 5 ++++-
 Sources/SwiftHtml/Tags/Q.swift          | 5 ++++-
 Sources/SwiftHtml/Tags/Rp.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Rt.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Ruby.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/S.swift          | 5 ++++-
 Sources/SwiftHtml/Tags/Samp.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Script.swift     | 2 ++
 Sources/SwiftHtml/Tags/Section.swift    | 5 ++++-
 Sources/SwiftHtml/Tags/Select.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Small.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Source.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Span.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Strong.swift     | 5 ++++-
 Sources/SwiftHtml/Tags/Style.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Sub.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Summary.swift    | 5 ++++-
 Sources/SwiftHtml/Tags/Sup.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Table.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Tbody.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Td.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Template.swift   | 5 ++++-
 Sources/SwiftHtml/Tags/Textarea.swift   | 5 ++++-
 Sources/SwiftHtml/Tags/Tfoot.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Th.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Thead.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Time.swift       | 5 ++++-
 Sources/SwiftHtml/Tags/Title.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Tr.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Track.swift      | 2 ++
 Sources/SwiftHtml/Tags/U.swift          | 5 ++++-
 Sources/SwiftHtml/Tags/Ul.swift         | 5 ++++-
 Sources/SwiftHtml/Tags/Var.swift        | 5 ++++-
 Sources/SwiftHtml/Tags/Video.swift      | 5 ++++-
 Sources/SwiftHtml/Tags/Wbr.swift        | 5 ++++-
 Sources/SwiftSgml/EmptyTag.swift        | 4 +---
 Sources/SwiftSgml/GroupTag.swift        | 6 ++----
 Sources/SwiftSgml/Tag.swift             | 8 +++-----
 113 files changed, 422 insertions(+), 111 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index e167ecb..af0a715 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -14,7 +14,10 @@
 /// - An unvisited link is underlined and blue
 /// - A visited link is underlined and purple
 /// - An active link is underlined and red
-open class A: Tag {}
+open class A: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension A {
     
diff --git a/Sources/SwiftHtml/Tags/Abbr.swift b/Sources/SwiftHtml/Tags/Abbr.swift
index b9c4961..29ea10a 100644
--- a/Sources/SwiftHtml/Tags/Abbr.swift
+++ b/Sources/SwiftHtml/Tags/Abbr.swift
@@ -8,5 +8,8 @@
 /// The `<abbr>` tag defines an abbreviation or an acronym, like "HTML", "CSS", "Mr.", "Dr.", "ASAP", "ATM".
 ///
 /// **Tip:** Use the global title attribute to show the description for the abbreviation/acronym when you mouse over the element.
-open class Abbr: Tag {}
+open class Abbr: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
diff --git a/Sources/SwiftHtml/Tags/Address.swift b/Sources/SwiftHtml/Tags/Address.swift
index acacce9..ea6ae3c 100644
--- a/Sources/SwiftHtml/Tags/Address.swift
+++ b/Sources/SwiftHtml/Tags/Address.swift
@@ -10,4 +10,7 @@
 /// The contact information can be an email address, URL, physical address, phone number, social media handle, etc.
 ///
 /// The text in the `<address>` element usually renders in italic, and browsers will always add a line break before and after the `<address>` element.
-open class Address: Tag {}
+open class Address: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index 34f6291..e8d5a3e 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -12,6 +12,8 @@
 /// **Note:** The usemap attribute in <img> is associated with the <map> element's name attribute, and creates a relationship between the image and the map.
 open class Area: EmptyTag {
     
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    
     public enum Rel: String {
         /// Links to an alternate version of the document (i.e. print page, translated or mirror)
         case alternate
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index 68d6a48..d9f1344 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -24,5 +24,8 @@ public extension Node {
 ///
 /// **Note:** The `<article>` element does not render as anything special in a browser.
 /// However, you can use CSS to style the `<article>` element (see example below).
-open class Article: Tag {}
+open class Article: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
diff --git a/Sources/SwiftHtml/Tags/Aside.swift b/Sources/SwiftHtml/Tags/Aside.swift
index 2d84c35..8a02b48 100644
--- a/Sources/SwiftHtml/Tags/Aside.swift
+++ b/Sources/SwiftHtml/Tags/Aside.swift
@@ -13,5 +13,8 @@
 /// 
 /// **Note:** The `<aside>` element does not render as anything special in a browser.
 /// However, you can use CSS to style the `<aside>` element (see example below).
-open class Aside: Tag {}
+open class Aside: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
diff --git a/Sources/SwiftHtml/Tags/Audio.swift b/Sources/SwiftHtml/Tags/Audio.swift
index d0afad7..a72c697 100644
--- a/Sources/SwiftHtml/Tags/Audio.swift
+++ b/Sources/SwiftHtml/Tags/Audio.swift
@@ -21,7 +21,10 @@
 ///     Safari   | YES | YES  | NO
 ///     Opera    | YES | YES  | YES
 ///      *From Edge 79
-open class Audio: Tag {}
+open class Audio: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Audio {
     
diff --git a/Sources/SwiftHtml/Tags/B.swift b/Sources/SwiftHtml/Tags/B.swift
index a29bc71..e93c297 100644
--- a/Sources/SwiftHtml/Tags/B.swift
+++ b/Sources/SwiftHtml/Tags/B.swift
@@ -6,4 +6,7 @@
 //
 
 /// Make some text bold (without marking it as important)
-open class B: Tag {}
+open class B: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index 05f5e5b..ffe2a38 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -10,7 +10,10 @@
 /// The `<base>` tag must have either an href or a target attribute present, or both.
 ///
 /// There can only be one single `<base>` element in a document, and it must be inside the `<head>` element.
-open class Base: EmptyTag {}
+open class Base: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Base {
     /// Specifies the base URL for all relative URLs in the page
diff --git a/Sources/SwiftHtml/Tags/Bdi.swift b/Sources/SwiftHtml/Tags/Bdi.swift
index 2a3da7b..b676c98 100644
--- a/Sources/SwiftHtml/Tags/Bdi.swift
+++ b/Sources/SwiftHtml/Tags/Bdi.swift
@@ -10,4 +10,7 @@
 /// The `<bdi>` tag isolates a part of text that might be formatted in a different direction from other text outside it.
 ///
 /// This element is useful when embedding user-generated content with an unknown text direction.
-open class Bdi: Tag {}
+open class Bdi: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Bdo.swift b/Sources/SwiftHtml/Tags/Bdo.swift
index 23dccdb..f7aa735 100644
--- a/Sources/SwiftHtml/Tags/Bdo.swift
+++ b/Sources/SwiftHtml/Tags/Bdo.swift
@@ -9,6 +9,8 @@
 ///
 /// The `<bdo>` tag is used to override the current text direction.
 open class Bdo: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
 
     public init(_ contents: String, dir: TextDirection = .ltr) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Blockquote.swift b/Sources/SwiftHtml/Tags/Blockquote.swift
index 9ca6fed..c0e342e 100644
--- a/Sources/SwiftHtml/Tags/Blockquote.swift
+++ b/Sources/SwiftHtml/Tags/Blockquote.swift
@@ -8,7 +8,10 @@
 /// The `<blockquote>` tag specifies a section that is quoted from another source.
 /// 
 /// Browsers usually indent `<blockquote>` elements (look at example below to see how to remove the indentation).
-open class Blockquote: Tag {}
+open class Blockquote: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Blockquote {
     /// Specifies the source of the quotation
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 0e74f86..d0afe51 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -10,4 +10,7 @@
 /// The `<body>` element contains all the contents of an HTML document, such as headings, paragraphs, images, hyperlinks, tables, lists, etc.
 /// 
 /// **Note:** There can only be one `<body>` element in an HTML document.
-open class Body: Tag {}
+open class Body: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index 5461853..67b3d23 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -10,4 +10,7 @@
 /// The `<br>` tag is useful for writing addresses or poems.
 /// 
 /// The `<br>` tag is an empty tag which means that it has no end tag.
-open class Br: EmptyTag {}
+open class Br: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Button.swift b/Sources/SwiftHtml/Tags/Button.swift
index b53fe5f..98e4704 100644
--- a/Sources/SwiftHtml/Tags/Button.swift
+++ b/Sources/SwiftHtml/Tags/Button.swift
@@ -12,7 +12,10 @@
 /// **Tip:** Always specify the type attribute for a `<button>` element, to tell browsers what type of button it is.
 ///
 /// **Tip:** You can easily style buttons with CSS! Look at the examples below or visit our CSS Buttons tutorial.
-open class Button: Tag {}
+open class Button: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Button {
     
diff --git a/Sources/SwiftHtml/Tags/Canvas.swift b/Sources/SwiftHtml/Tags/Canvas.swift
index 2c8f780..3b86f17 100644
--- a/Sources/SwiftHtml/Tags/Canvas.swift
+++ b/Sources/SwiftHtml/Tags/Canvas.swift
@@ -10,7 +10,10 @@
 /// The `<canvas>` tag is transparent, and is only a container for graphics, you must use a script to actually draw the graphics.
 /// 
 /// Any text inside the `<canvas>` element will be displayed in browsers with JavaScript disabled and in browsers that do not support <canvas>.
-open class Canvas: Tag {}
+open class Canvas: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Canvas {
 
diff --git a/Sources/SwiftHtml/Tags/Caption.swift b/Sources/SwiftHtml/Tags/Caption.swift
index d17063a..0ae95f4 100644
--- a/Sources/SwiftHtml/Tags/Caption.swift
+++ b/Sources/SwiftHtml/Tags/Caption.swift
@@ -10,4 +10,7 @@
 /// The `<caption>` tag must be inserted immediately after the `<table>` tag.
 /// 
 /// **Tip:** By default, a table caption will be center-aligned above a table. However, the CSS properties text-align and caption-side can be used to align and place the caption.
-open class Caption: Tag {}
+open class Caption: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Cite.swift b/Sources/SwiftHtml/Tags/Cite.swift
index 7f59782..0e5df0e 100644
--- a/Sources/SwiftHtml/Tags/Cite.swift
+++ b/Sources/SwiftHtml/Tags/Cite.swift
@@ -10,4 +10,7 @@
 /// **Note:** A person's name is not the title of a work.
 /// 
 /// The text in the `<cite>` element usually renders in italic.
-open class Cite: Tag {}
+open class Cite: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Code.swift b/Sources/SwiftHtml/Tags/Code.swift
index ede3ebc..1913acb 100644
--- a/Sources/SwiftHtml/Tags/Code.swift
+++ b/Sources/SwiftHtml/Tags/Code.swift
@@ -14,4 +14,7 @@
 /// - `<kbd>`    Defines keyboard input
 /// - `<var>`    Defines a variable
 /// - `<pre>`    Defines preformatted text
-open class Code: Tag {}
+open class Code: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index c087c13..4797cf7 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -8,7 +8,10 @@
 /// The `<col>` tag specifies column properties for each column within a `<colgroup>` element.
 /// 
 /// The `<col>` tag is useful for applying styles to entire columns, instead of repeating the styles for each cell, for each row.
-open class Col: EmptyTag {}
+open class Col: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Col {
     
diff --git a/Sources/SwiftHtml/Tags/Colgroup.swift b/Sources/SwiftHtml/Tags/Colgroup.swift
index 6011375..c2aff10 100644
--- a/Sources/SwiftHtml/Tags/Colgroup.swift
+++ b/Sources/SwiftHtml/Tags/Colgroup.swift
@@ -12,7 +12,10 @@
 /// **Note:** The `<colgroup>` tag must be a child of a `<table>` element, after any `<caption>` elements and before any `<thead>`, `<tbody>`, `<tfoot>`, and `<tr>` elements.
 ///
 /// **Tip:** To define different properties to a column within a `<colgroup>`, use the `<col>` tag within the `<colgroup>` tag.
-open class Colgroup: Tag {}
+open class Colgroup: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Colgroup {
     
diff --git a/Sources/SwiftHtml/Tags/Comment.swift b/Sources/SwiftHtml/Tags/Comment.swift
index a9af8a0..504011f 100644
--- a/Sources/SwiftHtml/Tags/Comment.swift
+++ b/Sources/SwiftHtml/Tags/Comment.swift
@@ -14,6 +14,8 @@
 /// This is especially useful if you have a lot of code.
 open class Comment: Tag {
     
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    
     public init(_ contents: String) {
         super.init()
         setContents(contents)
diff --git a/Sources/SwiftHtml/Tags/Data.swift b/Sources/SwiftHtml/Tags/Data.swift
index 83853ba..f0113a8 100644
--- a/Sources/SwiftHtml/Tags/Data.swift
+++ b/Sources/SwiftHtml/Tags/Data.swift
@@ -10,7 +10,10 @@
 /// This element provides both a machine-readable value for data processors, and a human-readable value for rendering in a browser.
 ///
 /// **Tip:** If the content is time- or date-related, use the `<time>` element instead.
-open class Data: Tag {}
+open class Data: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Data {
     
diff --git a/Sources/SwiftHtml/Tags/Datalist.swift b/Sources/SwiftHtml/Tags/Datalist.swift
index 1430fdc..c90cb93 100644
--- a/Sources/SwiftHtml/Tags/Datalist.swift
+++ b/Sources/SwiftHtml/Tags/Datalist.swift
@@ -10,4 +10,7 @@
 /// The `<datalist>` tag is used to provide an "autocomplete" feature for `<input>` elements. Users will see a drop-down list of pre-defined options as they input data.
 ///
 /// The `<datalist>` element's id attribute must be equal to the `<input>` element's list attribute (this binds them together).
-open class Datalist: Tag {}
+open class Datalist: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Dd.swift b/Sources/SwiftHtml/Tags/Dd.swift
index 8ea030c..48c346c 100644
--- a/Sources/SwiftHtml/Tags/Dd.swift
+++ b/Sources/SwiftHtml/Tags/Dd.swift
@@ -10,4 +10,7 @@
 /// The `<dd>` tag is used in conjunction with `<dl>` (defines a description list) and `<dt>` (defines terms/names).
 /// 
 /// Inside a `<dd>` tag you can put paragraphs, line breaks, images, links, lists, etc.
-open class Dd: Tag {}
+open class Dd: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Del.swift b/Sources/SwiftHtml/Tags/Del.swift
index 24a2801..1b8e845 100644
--- a/Sources/SwiftHtml/Tags/Del.swift
+++ b/Sources/SwiftHtml/Tags/Del.swift
@@ -8,7 +8,10 @@
 /// The `<del>` tag defines text that has been deleted from a document.
 ///
 /// Browsers will usually strike a line through deleted text.
-open class Del: Tag {}
+open class Del: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Del {
     
diff --git a/Sources/SwiftHtml/Tags/Details.swift b/Sources/SwiftHtml/Tags/Details.swift
index cd6c9d8..2847071 100644
--- a/Sources/SwiftHtml/Tags/Details.swift
+++ b/Sources/SwiftHtml/Tags/Details.swift
@@ -12,7 +12,10 @@
 /// Any sort of content can be put inside the `<details>` tag.
 ///
 /// **Tip:** The `<summary>` tag is used in conjuction with `<details>` to specify a visible heading for the details.
-open class Details: Tag {}
+open class Details: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Details {
     
diff --git a/Sources/SwiftHtml/Tags/Dfn.swift b/Sources/SwiftHtml/Tags/Dfn.swift
index 0432541..9b37255 100644
--- a/Sources/SwiftHtml/Tags/Dfn.swift
+++ b/Sources/SwiftHtml/Tags/Dfn.swift
@@ -13,4 +13,5 @@
 /// `<p><dfn>HTML</dfn> is the standard markup language for creating web pages.</p>`
 open class Dfn: Tag {
     
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
 }
diff --git a/Sources/SwiftHtml/Tags/Dialog.swift b/Sources/SwiftHtml/Tags/Dialog.swift
index bf9ea95..9729ada 100644
--- a/Sources/SwiftHtml/Tags/Dialog.swift
+++ b/Sources/SwiftHtml/Tags/Dialog.swift
@@ -10,6 +10,7 @@
 /// The `<dialog>` element makes it easy to create popup dialogs and modals on a web page.
 open class Dialog: Tag {
     
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
 }
 
 public extension Dialog {
diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index 557c2f8..7dc78f6 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -14,7 +14,10 @@
 /// Any sort of content can be put inside the `<div>` tag!
 ///
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
-open class Div: Tag {}
+open class Div: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 
 
diff --git a/Sources/SwiftHtml/Tags/Dl.swift b/Sources/SwiftHtml/Tags/Dl.swift
index 28ba922..c5b218e 100644
--- a/Sources/SwiftHtml/Tags/Dl.swift
+++ b/Sources/SwiftHtml/Tags/Dl.swift
@@ -8,4 +8,7 @@
 /// The `<dl>` tag defines a description list.
 ///
 /// The `<dl>` tag is used in conjunction with `<dt>` (defines terms/names) and `<dd>` (describes each term/name).
-open class Dl: Tag {}
+open class Dl: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Dt.swift b/Sources/SwiftHtml/Tags/Dt.swift
index 85080ba..3e5f53e 100644
--- a/Sources/SwiftHtml/Tags/Dt.swift
+++ b/Sources/SwiftHtml/Tags/Dt.swift
@@ -8,4 +8,7 @@
 /// The `<dt>` tag defines a term/name in a description list.
 /// 
 /// The `<dt>` tag is used in conjunction with `<dl>` (defines a description list) and `<dd>` (describes each term/name).
-open class Dt: Tag {}
+open class Dt: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Em.swift b/Sources/SwiftHtml/Tags/Em.swift
index dce0771..c473f55 100644
--- a/Sources/SwiftHtml/Tags/Em.swift
+++ b/Sources/SwiftHtml/Tags/Em.swift
@@ -8,4 +8,7 @@
 /// The `<em>` tag is used to define emphasized text. The content inside is typically displayed in italic.
 ///
 /// A screen reader will pronounce the words in `<em>` with an emphasis, using verbal stress.
-open class Em: Tag {}
+open class Em: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index 5ca16b0..a51e948 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -6,7 +6,10 @@
 //
 
 /// The `<embed>` tag defines a container for an external resource, such as a web page, a picture, a media player, or a plug-in application.
-open class Embed: EmptyTag {}
+open class Embed: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 
 public extension Embed {
diff --git a/Sources/SwiftHtml/Tags/Fieldset.swift b/Sources/SwiftHtml/Tags/Fieldset.swift
index 4104b11..7016898 100644
--- a/Sources/SwiftHtml/Tags/Fieldset.swift
+++ b/Sources/SwiftHtml/Tags/Fieldset.swift
@@ -8,7 +8,10 @@
 /// The `<fieldset>` tag is used to group related elements in a form.
 /// 
 /// The `<fieldset>` tag draws a box around the related elements.
-open class Fieldset: Tag {}
+open class Fieldset: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Fieldset {
     
diff --git a/Sources/SwiftHtml/Tags/Figcaption.swift b/Sources/SwiftHtml/Tags/Figcaption.swift
index 55d0c1d..a908fae 100644
--- a/Sources/SwiftHtml/Tags/Figcaption.swift
+++ b/Sources/SwiftHtml/Tags/Figcaption.swift
@@ -8,4 +8,7 @@
 /// The `<figcaption>` tag defines a caption for a `<figure>` element.
 ///
 /// The `<figcaption>` element can be placed as the first or last child of the `<figure>` element.
-open class Figcaption: Tag {}
+open class Figcaption: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Figure.swift b/Sources/SwiftHtml/Tags/Figure.swift
index 0350341..76628d3 100644
--- a/Sources/SwiftHtml/Tags/Figure.swift
+++ b/Sources/SwiftHtml/Tags/Figure.swift
@@ -10,5 +10,8 @@
 /// While the content of the `<figure>` element is related to the main flow, its position is independent of the main flow, and if removed it should not affect the flow of the document.
 ///
 /// **Tip:** The `<figcaption>` element is used to add a caption for the `<figure>` element.
-open class Figure: Tag {}
+open class Figure: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
diff --git a/Sources/SwiftHtml/Tags/Footer.swift b/Sources/SwiftHtml/Tags/Footer.swift
index 69fe336..4002857 100644
--- a/Sources/SwiftHtml/Tags/Footer.swift
+++ b/Sources/SwiftHtml/Tags/Footer.swift
@@ -16,4 +16,7 @@
 /// - back to top links
 /// - related documents
 /// You can have several `<footer>` elements in one document.
-open class Footer: Tag {}
+open class Footer: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Form.swift b/Sources/SwiftHtml/Tags/Form.swift
index ae259d5..aca3700 100644
--- a/Sources/SwiftHtml/Tags/Form.swift
+++ b/Sources/SwiftHtml/Tags/Form.swift
@@ -18,7 +18,10 @@
 /// - `<fieldset>`
 /// - `<label>`
 /// - `<output>`
-open class Form: Tag {}
+open class Form: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Form {
     
diff --git a/Sources/SwiftHtml/Tags/H1.swift b/Sources/SwiftHtml/Tags/H1.swift
index d1260f0..5df0602 100644
--- a/Sources/SwiftHtml/Tags/H1.swift
+++ b/Sources/SwiftHtml/Tags/H1.swift
@@ -11,4 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H1: Tag {}
+open class H1: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/H2.swift b/Sources/SwiftHtml/Tags/H2.swift
index d84ce18..10616b3 100644
--- a/Sources/SwiftHtml/Tags/H2.swift
+++ b/Sources/SwiftHtml/Tags/H2.swift
@@ -11,4 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H2: Tag {}
+open class H2: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/H3.swift b/Sources/SwiftHtml/Tags/H3.swift
index 7cce3ed..12ad78c 100644
--- a/Sources/SwiftHtml/Tags/H3.swift
+++ b/Sources/SwiftHtml/Tags/H3.swift
@@ -11,4 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H3: Tag {}
+open class H3: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/H4.swift b/Sources/SwiftHtml/Tags/H4.swift
index 02705a8..a3021e5 100644
--- a/Sources/SwiftHtml/Tags/H4.swift
+++ b/Sources/SwiftHtml/Tags/H4.swift
@@ -11,4 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H4: Tag {}
+open class H4: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/H5.swift b/Sources/SwiftHtml/Tags/H5.swift
index a530afd..84640da 100644
--- a/Sources/SwiftHtml/Tags/H5.swift
+++ b/Sources/SwiftHtml/Tags/H5.swift
@@ -11,4 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H5: Tag {}
+open class H5: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/H6.swift b/Sources/SwiftHtml/Tags/H6.swift
index b13151c..2aaed88 100644
--- a/Sources/SwiftHtml/Tags/H6.swift
+++ b/Sources/SwiftHtml/Tags/H6.swift
@@ -11,4 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H6: Tag {}
+open class H6: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index b03834f..15912e8 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -20,4 +20,7 @@
 /// - `<meta>`
 /// - `<script>`
 /// - `<noscript>`
-open class Head: Tag {}
+open class Head: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Header.swift b/Sources/SwiftHtml/Tags/Header.swift
index 14ca541..3e27efc 100644
--- a/Sources/SwiftHtml/Tags/Header.swift
+++ b/Sources/SwiftHtml/Tags/Header.swift
@@ -13,5 +13,8 @@
 /// - logo or icon
 /// - authorship information
 /// **Note:** You can have several` <header>` elements in one HTML document. However,` <header>` cannot be placed within a` <footer>`,` <address>` or another` <header>` element.
-open class Header: Tag {}
+open class Header: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index e66eed3..d56e556 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -8,4 +8,7 @@
 /// The `<hr>` tag defines a thematic break in an HTML page (e.g. a shift of topic).
 ///
 /// The `<hr>` element is most often displayed as a horizontal rule that is used to separate content (or define a change) in an HTML page.
-open class Hr: EmptyTag {}
+open class Hr: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index b655343..6af532a 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -10,7 +10,10 @@
 /// The `<html>` tag is the container for all other HTML elements (except for the `<!DOCTYPE>` tag).
 ///
 /// **Note:** You should always include the lang attribute inside the `<html>` tag, to declare the language of the Web page. This is meant to assist search engines and browsers.
-open class Html: Tag {}
+open class Html: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Html {
     
diff --git a/Sources/SwiftHtml/Tags/I.swift b/Sources/SwiftHtml/Tags/I.swift
index c051a17..2c085e2 100644
--- a/Sources/SwiftHtml/Tags/I.swift
+++ b/Sources/SwiftHtml/Tags/I.swift
@@ -16,4 +16,7 @@
 /// - `<mark>` (marked/highlighted text)
 /// - `<cite>` (the title of a work)
 /// - `<dfn>` (a definition term)
-open class I: Tag {}
+open class I: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Iframe.swift b/Sources/SwiftHtml/Tags/Iframe.swift
index 8543d9e..56cc7cb 100644
--- a/Sources/SwiftHtml/Tags/Iframe.swift
+++ b/Sources/SwiftHtml/Tags/Iframe.swift
@@ -12,7 +12,10 @@
 /// **Tip:** Use CSS to style the `<iframe>` (see example below).
 ///
 /// **Tip:** It is a good practice to always include a title attribute for the `<iframe>`. This is used by screen readers to read out what the content of the `<iframe>` is.
-open class Iframe: Tag {}
+open class Iframe: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Iframe {
     enum Sandbox {
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index c89579f..61149be 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -19,6 +19,8 @@
 ///
 /// **Tip:** To link an image to another document, simply nest the `<img>` tag inside an `<a>` tag (see example below).
 open class Img: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
 
     public init(src: String, alt: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index be137e9..8550990 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -10,7 +10,10 @@
 /// The `<input>` element is the most important form element.
 ///
 /// The `<input>` element can be displayed in several ways, depending on the type attribute.
-open class Input: EmptyTag {}
+open class Input: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Input {
     
diff --git a/Sources/SwiftHtml/Tags/Ins.swift b/Sources/SwiftHtml/Tags/Ins.swift
index f14c159..bb70675 100644
--- a/Sources/SwiftHtml/Tags/Ins.swift
+++ b/Sources/SwiftHtml/Tags/Ins.swift
@@ -8,4 +8,7 @@
 /// The `<ins>` tag defines a text that has been inserted into a document. Browsers will usually underline inserted text.
 ///
 /// **Tip:** Also look at the `<del>` tag to markup deleted text.
-open class Ins: Tag {}
+open class Ins: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Kbd.swift b/Sources/SwiftHtml/Tags/Kbd.swift
index 003d40a..994f14e 100644
--- a/Sources/SwiftHtml/Tags/Kbd.swift
+++ b/Sources/SwiftHtml/Tags/Kbd.swift
@@ -8,4 +8,7 @@
 /// The `<kbd>` tag is used to define keyboard input. The content inside is displayed in the browser's default monospace font.
 ///
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS (see example below).
-open class Kbd: Tag {}
+open class Kbd: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Label.swift b/Sources/SwiftHtml/Tags/Label.swift
index 65ace0f..d4b5c34 100644
--- a/Sources/SwiftHtml/Tags/Label.swift
+++ b/Sources/SwiftHtml/Tags/Label.swift
@@ -33,7 +33,10 @@
 ///
 /// Screen reader users (will read out loud the label, when the user is focused on the element)
 /// Users who have difficulty clicking on very small regions (such as checkboxes) - because when a user clicks the text within the `<label>` element, it toggles the input (this increases the hit area).
-open class Label: Tag {}
+open class Label: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Label {
     /// Specifies the id of the form element the label should be bound to
diff --git a/Sources/SwiftHtml/Tags/Legend.swift b/Sources/SwiftHtml/Tags/Legend.swift
index 4e5a5f2..efa6bb9 100644
--- a/Sources/SwiftHtml/Tags/Legend.swift
+++ b/Sources/SwiftHtml/Tags/Legend.swift
@@ -6,4 +6,7 @@
 //
 
 /// The `<legend>` tag defines a caption for the `<fieldset>` element.
-open class Legend: Tag {}
+open class Legend: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Li.swift b/Sources/SwiftHtml/Tags/Li.swift
index 518afe7..69bfc8a 100644
--- a/Sources/SwiftHtml/Tags/Li.swift
+++ b/Sources/SwiftHtml/Tags/Li.swift
@@ -14,7 +14,10 @@
 /// In `<ol>`, the list items will usually be displayed with numbers or letters.
 ///
 /// **Tip:** Use CSS to style lists.
-open class Li: Tag {}
+open class Li: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Li {
     
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index ff8821b..b525010 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -11,6 +11,8 @@
 /// 
 /// The `<link>` element is an empty element, it contains attributes only.
 open class Link: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
 
     public init(rel: Rel) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/MainTag.swift b/Sources/SwiftHtml/Tags/MainTag.swift
index b1073b9..1fa1513 100644
--- a/Sources/SwiftHtml/Tags/MainTag.swift
+++ b/Sources/SwiftHtml/Tags/MainTag.swift
@@ -10,6 +10,9 @@
 /// The content inside the `<main>` element should be unique to the document. It should not contain any content that is repeated across documents such as sidebars, navigation links, copyright information, site logos, and search forms.
 ///
 /// **Note:** There must not be more than one `<main>` element in a document. The `<main>` element must NOT be a descendant of an `<article>`, `<aside>`, `<footer>`, `<header>`, or `<nav>` element.
-open class Main: Tag {}
+open class Main: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index 51f825d..730263c 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -11,6 +11,8 @@
 ///
 /// The `<map>` element contains a number of `<area>` elements, that defines the clickable areas in the image map.
 open class Map: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
 
     public init(name: String, @TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
diff --git a/Sources/SwiftHtml/Tags/Mark.swift b/Sources/SwiftHtml/Tags/Mark.swift
index 417f5c3..5333d3f 100644
--- a/Sources/SwiftHtml/Tags/Mark.swift
+++ b/Sources/SwiftHtml/Tags/Mark.swift
@@ -6,4 +6,7 @@
 //
 
 /// The `<mark>` tag defines text that should be marked or highlighted.
-open class Mark: Tag {}
+open class Mark: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index 99cef99..418dd04 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -14,7 +14,10 @@
 /// Metadata is used by browsers (how to display content or reload page), search engines (keywords), and other web services.
 ///
 /// There is a method to let web designers take control over the viewport (the user's visible area of a web page), through the `<meta>` tag (See "Setting The Viewport" example below).
-open class Meta: EmptyTag {}
+open class Meta: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Meta {
     
diff --git a/Sources/SwiftHtml/Tags/Meter.swift b/Sources/SwiftHtml/Tags/Meter.swift
index 8d79638..a7d9065 100644
--- a/Sources/SwiftHtml/Tags/Meter.swift
+++ b/Sources/SwiftHtml/Tags/Meter.swift
@@ -14,6 +14,8 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Meter: Tag {
     
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    
     public init(value: Int, _ contents: String) {
         super.init()
         setContents(contents)
diff --git a/Sources/SwiftHtml/Tags/Nav.swift b/Sources/SwiftHtml/Tags/Nav.swift
index 6cf7f6c..1cd88fb 100644
--- a/Sources/SwiftHtml/Tags/Nav.swift
+++ b/Sources/SwiftHtml/Tags/Nav.swift
@@ -10,7 +10,10 @@
 /// Notice that NOT all links of a document should be inside a `<nav>` element. The `<nav>` element is intended only for major block of navigation links.
 /// 
 /// Browsers, such as screen readers for disabled users, can use this element to determine whether to omit the initial rendering of this content.
-open class Nav: Tag {}
+open class Nav: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 
 
diff --git a/Sources/SwiftHtml/Tags/Noscript.swift b/Sources/SwiftHtml/Tags/Noscript.swift
index 6454dbb..d85ea1b 100644
--- a/Sources/SwiftHtml/Tags/Noscript.swift
+++ b/Sources/SwiftHtml/Tags/Noscript.swift
@@ -8,4 +8,7 @@
 /// The `<noscript>` tag defines an alternate content to be displayed to users that have disabled scripts in their browser or have a browser that doesn't support script.
 /// 
 /// The `<noscript>` element can be used in both `<head>` and `<body>`. When used inside `<head>`, the `<noscript>` element could only contain `<link>`, `<style>`, and `<meta>` elements.
-open class Noscript: Tag {}
+open class Noscript: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Object.swift b/Sources/SwiftHtml/Tags/Object.swift
index 91429bb..76c3548 100644
--- a/Sources/SwiftHtml/Tags/Object.swift
+++ b/Sources/SwiftHtml/Tags/Object.swift
@@ -8,7 +8,10 @@
 /// The `<object>` tag defines a container for an external resource.
 ///
 /// The external resource can be a web page, a picture, a media player, or a plug-in application.
-open class Object: Tag {}
+open class Object: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Object {
     
diff --git a/Sources/SwiftHtml/Tags/Ol.swift b/Sources/SwiftHtml/Tags/Ol.swift
index 63b33cf..bf59fa6 100644
--- a/Sources/SwiftHtml/Tags/Ol.swift
+++ b/Sources/SwiftHtml/Tags/Ol.swift
@@ -12,7 +12,10 @@
 /// **Tip:** Use CSS to style lists.
 /// 
 /// **Tip:** For unordered list, use the `<ul>` tag.
-open class Ol: Tag {}
+open class Ol: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Ol {
     
diff --git a/Sources/SwiftHtml/Tags/Optgroup.swift b/Sources/SwiftHtml/Tags/Optgroup.swift
index eae46b3..943284e 100644
--- a/Sources/SwiftHtml/Tags/Optgroup.swift
+++ b/Sources/SwiftHtml/Tags/Optgroup.swift
@@ -8,7 +8,10 @@
 /// The `<optgroup>` tag is used to group related options in a `<select>` element (drop-down list).
 /// 
 /// If you have a long list of options, groups of related options are easier to handle for a user.
-open class Optgroup: Tag {}
+open class Optgroup: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Optgroup {
     
diff --git a/Sources/SwiftHtml/Tags/Option.swift b/Sources/SwiftHtml/Tags/Option.swift
index beffd4c..9a7d5a3 100644
--- a/Sources/SwiftHtml/Tags/Option.swift
+++ b/Sources/SwiftHtml/Tags/Option.swift
@@ -12,7 +12,10 @@
 /// **Note:** The `<option>` tag can be used without any attributes, but you usually need the value attribute, which indicates what is sent to the server on form submission.
 /// 
 /// **Tip:** If you have a long list of options, you can group related options within the `<optgroup>` tag.
-open class Option: Tag {}
+open class Option: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Option {
     /// Specifies that an option should be disabled
diff --git a/Sources/SwiftHtml/Tags/Output.swift b/Sources/SwiftHtml/Tags/Output.swift
index 6fb68aa..85cd1e2 100644
--- a/Sources/SwiftHtml/Tags/Output.swift
+++ b/Sources/SwiftHtml/Tags/Output.swift
@@ -6,7 +6,10 @@
 //
 
 /// The `<output>` tag is used to represent the result of a calculation (like one performed by a script).
-open class Output: Tag {}
+open class Output: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Output {
     
diff --git a/Sources/SwiftHtml/Tags/P.swift b/Sources/SwiftHtml/Tags/P.swift
index 306a2da..8dbec53 100644
--- a/Sources/SwiftHtml/Tags/P.swift
+++ b/Sources/SwiftHtml/Tags/P.swift
@@ -10,4 +10,7 @@
 /// Browsers automatically add a single blank line before and after each `<p>` element.
 /// 
 /// **Tip:** Use CSS to style paragraphs.
-open class P: Tag {}
+open class P: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index 13258b3..eb85efe 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -6,7 +6,10 @@
 //
 
 /// The `<param>` tag is used to define parameters for an `<object>` element.
-open class Param: EmptyTag {}
+open class Param: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Param {
     
diff --git a/Sources/SwiftHtml/Tags/Picture.swift b/Sources/SwiftHtml/Tags/Picture.swift
index 85a95dd..d4dbdcc 100644
--- a/Sources/SwiftHtml/Tags/Picture.swift
+++ b/Sources/SwiftHtml/Tags/Picture.swift
@@ -16,4 +16,7 @@
 /// The `<img>` element is required as the last child of the `<picture>` element, as a fallback option if none of the source tags matches.
 ///
 /// **Tip:** The `<picture>` element works "similar" to `<video>` and `<audio>`. You set up different sources, and the first source that fits the preferences is the one being used.
-open class Picture: Tag {}
+open class Picture: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Pre.swift b/Sources/SwiftHtml/Tags/Pre.swift
index 94e462d..f3967fb 100644
--- a/Sources/SwiftHtml/Tags/Pre.swift
+++ b/Sources/SwiftHtml/Tags/Pre.swift
@@ -9,4 +9,7 @@
 ///
 /// Text in a `<pre>` element is displayed in a fixed-width font, and the text preserves both spaces and line breaks.
 /// The text will be displayed exactly as written in the HTML source code.
-open class Pre: Tag {}
+open class Pre: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Progress.swift b/Sources/SwiftHtml/Tags/Progress.swift
index 426d889..3a4af2b 100644
--- a/Sources/SwiftHtml/Tags/Progress.swift
+++ b/Sources/SwiftHtml/Tags/Progress.swift
@@ -8,7 +8,10 @@
 /// The `<progress>` tag represents the completion progress of a task.
 /// 
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Progress: Tag {}
+open class Progress: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Progress {
     
diff --git a/Sources/SwiftHtml/Tags/Q.swift b/Sources/SwiftHtml/Tags/Q.swift
index 92b0e9a..0c538cf 100644
--- a/Sources/SwiftHtml/Tags/Q.swift
+++ b/Sources/SwiftHtml/Tags/Q.swift
@@ -10,7 +10,10 @@
 /// Browsers normally insert quotation marks around the quotation.
 ///
 /// **Tip:** Use `<blockquote>` for long quotations.
-open class Q: Tag {}
+open class Q: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Q {
     
diff --git a/Sources/SwiftHtml/Tags/Rp.swift b/Sources/SwiftHtml/Tags/Rp.swift
index a1047c5..45eb5bb 100644
--- a/Sources/SwiftHtml/Tags/Rp.swift
+++ b/Sources/SwiftHtml/Tags/Rp.swift
@@ -8,4 +8,7 @@
 /// The `<rp>` tag can be used to provide parentheses around a ruby text, to be shown by browsers that do not support ruby annotations.
 ///
 /// Use `<rp>` together with `<ruby>` and `<rt>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
-open class Rp: Tag {}
+open class Rp: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Rt.swift b/Sources/SwiftHtml/Tags/Rt.swift
index a895ad0..266d9a9 100644
--- a/Sources/SwiftHtml/Tags/Rt.swift
+++ b/Sources/SwiftHtml/Tags/Rt.swift
@@ -8,4 +8,7 @@
 /// The `<rt>` tag defines an explanation or pronunciation of characters (for East Asian typography) in a ruby annotation.
 ///
 /// Use `<rt>` together with `<ruby>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
-open class Rt: Tag {}
+open class Rt: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Ruby.swift b/Sources/SwiftHtml/Tags/Ruby.swift
index e66e0af..992b765 100644
--- a/Sources/SwiftHtml/Tags/Ruby.swift
+++ b/Sources/SwiftHtml/Tags/Ruby.swift
@@ -10,4 +10,7 @@
 /// A ruby annotation is a small extra text, attached to the main text to indicate the pronunciation or meaning of the corresponding characters. This kind of annotation is often used in Japanese publications.
 ///
 /// Use `<ruby>` together with `<rt>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that do not support ruby annotations.
-open class Ruby: Tag {}
+open class Ruby: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/S.swift b/Sources/SwiftHtml/Tags/S.swift
index 5b56150..e1e6060 100644
--- a/Sources/SwiftHtml/Tags/S.swift
+++ b/Sources/SwiftHtml/Tags/S.swift
@@ -8,4 +8,7 @@
 /// The `<s>` tag specifies text that is no longer correct, accurate or relevant. The text will be displayed with a line through it.
 ///
 /// The `<s>` tag should not be used to define deleted text in a document, use the `<del>` tag for that.
-open class S: Tag {}
+open class S: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Samp.swift b/Sources/SwiftHtml/Tags/Samp.swift
index fbe4a88..82b574c 100644
--- a/Sources/SwiftHtml/Tags/Samp.swift
+++ b/Sources/SwiftHtml/Tags/Samp.swift
@@ -8,4 +8,7 @@
 /// The `<samp>` tag is used to define sample output from a computer program. The content inside is displayed in the browser's default monospace font.
 ///
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
-open class Samp: Tag {}
+open class Samp: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Script.swift b/Sources/SwiftHtml/Tags/Script.swift
index 719eb5c..0d899ec 100644
--- a/Sources/SwiftHtml/Tags/Script.swift
+++ b/Sources/SwiftHtml/Tags/Script.swift
@@ -12,6 +12,8 @@
 /// Common uses for JavaScript are image manipulation, form validation, and dynamic changes of content.
 open class Script: Tag {
     
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    
     public enum `Type`: String {
         case javascript = "text/javascript"
     }
diff --git a/Sources/SwiftHtml/Tags/Section.swift b/Sources/SwiftHtml/Tags/Section.swift
index 6a3ee7c..7ac0a61 100644
--- a/Sources/SwiftHtml/Tags/Section.swift
+++ b/Sources/SwiftHtml/Tags/Section.swift
@@ -6,4 +6,7 @@
 //
 
 /// The `<section>` tag defines a section in a document.
-open class Section: Tag {}
+open class Section: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Select.swift b/Sources/SwiftHtml/Tags/Select.swift
index 84bc5a3..d3c0319 100644
--- a/Sources/SwiftHtml/Tags/Select.swift
+++ b/Sources/SwiftHtml/Tags/Select.swift
@@ -16,7 +16,10 @@
 /// The `<option>` tags inside the `<select>` element define the available options in the drop-down list.
 ///
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Select: Tag {}
+open class Select: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Select {
     
diff --git a/Sources/SwiftHtml/Tags/Small.swift b/Sources/SwiftHtml/Tags/Small.swift
index 0bd4db9..fcaf2b4 100644
--- a/Sources/SwiftHtml/Tags/Small.swift
+++ b/Sources/SwiftHtml/Tags/Small.swift
@@ -8,4 +8,7 @@
 /// The `<small>` tag defines smaller text (like copyright and other side-comments).
 ///
 /// **Tip:** This tag is not deprecated, but it is possible to achieve richer (or the same) effect with CSS.
-open class Small: Tag {}
+open class Small: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index eae18ad..84108f3 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -10,7 +10,10 @@
 ///
 /// The `<source>` tag allows you to specify alternative video/audio/image files which the browser may choose from, based on browser support or viewport width.
 /// The browser will choose the first `<source>` it supports.
-open class Source: EmptyTag {}
+open class Source: EmptyTag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Source {
     
diff --git a/Sources/SwiftHtml/Tags/Span.swift b/Sources/SwiftHtml/Tags/Span.swift
index 2006e94..7031ba8 100644
--- a/Sources/SwiftHtml/Tags/Span.swift
+++ b/Sources/SwiftHtml/Tags/Span.swift
@@ -10,4 +10,7 @@
 /// The `<span>` tag is easily styled by CSS or manipulated with JavaScript using the class or id attribute.
 ///
 /// The `<span>` tag is much like the `<div>` element, but `<div>` is a block-level element and `<span>` is an inline element.
-open class Span: Tag {}
+open class Span: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Strong.swift b/Sources/SwiftHtml/Tags/Strong.swift
index 05e003c..ff00b55 100644
--- a/Sources/SwiftHtml/Tags/Strong.swift
+++ b/Sources/SwiftHtml/Tags/Strong.swift
@@ -8,4 +8,7 @@
 /// The `<strong>` tag is used to define text with strong importance. The content inside is typically displayed in bold.
 ///
 /// **Tip:** Use the `<b>` tag to specify bold text without any extra importance!
-open class Strong: Tag {}
+open class Strong: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Style.swift b/Sources/SwiftHtml/Tags/Style.swift
index a914afe..31ae32e 100644
--- a/Sources/SwiftHtml/Tags/Style.swift
+++ b/Sources/SwiftHtml/Tags/Style.swift
@@ -9,7 +9,10 @@
 /// The `<style>` tag is used to define style information (CSS) for a document.
 ///
 /// Inside the `<style>` element you specify how HTML elements should render in a browser.
-open class Style: Tag {}
+open class Style: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Style {
 
diff --git a/Sources/SwiftHtml/Tags/Sub.swift b/Sources/SwiftHtml/Tags/Sub.swift
index 58f382b..c9cd88d 100644
--- a/Sources/SwiftHtml/Tags/Sub.swift
+++ b/Sources/SwiftHtml/Tags/Sub.swift
@@ -11,4 +11,7 @@
 /// Subscript text can be used for chemical formulas, like H2O.
 ///
 /// **Tip:** Use the `<sup>` tag to define superscripted text.
-open class Sub: Tag {}
+open class Sub: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Summary.swift b/Sources/SwiftHtml/Tags/Summary.swift
index 0452318..b5b37e3 100644
--- a/Sources/SwiftHtml/Tags/Summary.swift
+++ b/Sources/SwiftHtml/Tags/Summary.swift
@@ -8,4 +8,7 @@
 /// The `<summary>` tag defines a visible heading for the `<details>` element. The heading can be clicked to view/hide the details.
 ///
 /// **Note:** The `<summary>` element should be the first child element of the `<details>` element.
-open class Summary: Tag {}
+open class Summary: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Sup.swift b/Sources/SwiftHtml/Tags/Sup.swift
index b6aceac..022bbd8 100644
--- a/Sources/SwiftHtml/Tags/Sup.swift
+++ b/Sources/SwiftHtml/Tags/Sup.swift
@@ -11,4 +11,7 @@
 /// Superscript text can be used for footnotes, like WWW[1].
 ///
 /// **Tip:** Use the `<sub>` tag to define subscript text.
-open class Sup: Tag {}
+open class Sup: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Table.swift b/Sources/SwiftHtml/Tags/Table.swift
index 22d9d5e..034a09b 100644
--- a/Sources/SwiftHtml/Tags/Table.swift
+++ b/Sources/SwiftHtml/Tags/Table.swift
@@ -12,4 +12,7 @@
 /// The `<tr>` element defines a table row, the `<th>` element defines a table header, and the `<td>` element defines a table cell.
 /// 
 /// An HTML table may also include `<caption>`, `<colgroup>`, `<thead>`, `<tfoot>`, and `<tbody>` elements.
-open class Table: Tag {}
+open class Table: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Tbody.swift b/Sources/SwiftHtml/Tags/Tbody.swift
index 7f8eeb3..47ff20f 100644
--- a/Sources/SwiftHtml/Tags/Tbody.swift
+++ b/Sources/SwiftHtml/Tags/Tbody.swift
@@ -17,5 +17,8 @@
 /// The `<tbody>` tag must be used in the following context: As a child of a `<table>` element, after any `<caption>`, `<colgroup>`, and `<thead>` elements.
 ///
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
-open class Tbody: Tag {}
+open class Tbody: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
diff --git a/Sources/SwiftHtml/Tags/Td.swift b/Sources/SwiftHtml/Tags/Td.swift
index bb196a6..0e9d974 100644
--- a/Sources/SwiftHtml/Tags/Td.swift
+++ b/Sources/SwiftHtml/Tags/Td.swift
@@ -15,7 +15,10 @@
 /// The text in `<td>` elements are regular and left-aligned by default.
 ///
 /// The text in `<th>` elements are bold and centered by default.
-open class Td: Tag {}
+open class Td: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Td {
     
diff --git a/Sources/SwiftHtml/Tags/Template.swift b/Sources/SwiftHtml/Tags/Template.swift
index 1f2dd70..5f19d41 100644
--- a/Sources/SwiftHtml/Tags/Template.swift
+++ b/Sources/SwiftHtml/Tags/Template.swift
@@ -11,7 +11,10 @@
 ///
 /// You can use the `<template>` tag if you have some HTML code you want to use over and over again, but not until you ask for it.
 /// To do this without the `<template>` tag, you have to create the HTML code with JavaScript to prevent the browser from rendering the code.
-open class Template: Tag {}
+open class Template: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 
 
diff --git a/Sources/SwiftHtml/Tags/Textarea.swift b/Sources/SwiftHtml/Tags/Textarea.swift
index 03e8649..0d23eff 100644
--- a/Sources/SwiftHtml/Tags/Textarea.swift
+++ b/Sources/SwiftHtml/Tags/Textarea.swift
@@ -18,7 +18,10 @@
 /// The id attribute is needed to associate the text area with a label.
 ///
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Textarea: Tag {}
+open class Textarea: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Textarea {
     
diff --git a/Sources/SwiftHtml/Tags/Tfoot.swift b/Sources/SwiftHtml/Tags/Tfoot.swift
index fee9460..baafe34 100644
--- a/Sources/SwiftHtml/Tags/Tfoot.swift
+++ b/Sources/SwiftHtml/Tags/Tfoot.swift
@@ -17,4 +17,7 @@
 /// The `<tfoot>` tag must be used in the following context: As a child of a <table> element, after any `<caption>`, `<colgroup>`, `<thead>`, and `<tbody>` elements.
 ///
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
-open class Tfoot: Tag {}
+open class Tfoot: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Th.swift b/Sources/SwiftHtml/Tags/Th.swift
index 848eb62..d58ca43 100644
--- a/Sources/SwiftHtml/Tags/Th.swift
+++ b/Sources/SwiftHtml/Tags/Th.swift
@@ -15,7 +15,10 @@
 /// The text in `<th>` elements are bold and centered by default.
 ///
 /// The text in `<td>` elements are regular and left-aligned by default.
-open class Th: Tag {}
+open class Th: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Th {
     
diff --git a/Sources/SwiftHtml/Tags/Thead.swift b/Sources/SwiftHtml/Tags/Thead.swift
index 09445f3..e8ec2a1 100644
--- a/Sources/SwiftHtml/Tags/Thead.swift
+++ b/Sources/SwiftHtml/Tags/Thead.swift
@@ -17,4 +17,7 @@
 /// The `<thead>` tag must be used in the following context: As a child of a `<table>` element, after any `<caption>` and `<colgroup>` elements, and before any `<tbody>`, `<tfoot>`, and `<tr>` elements.
 ///
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
-open class Thead: Tag {}
+open class Thead: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Time.swift b/Sources/SwiftHtml/Tags/Time.swift
index 9333677..797d7a7 100644
--- a/Sources/SwiftHtml/Tags/Time.swift
+++ b/Sources/SwiftHtml/Tags/Time.swift
@@ -8,7 +8,10 @@
 /// The `<time>` tag defines a specific time (or datetime).
 ///
 /// The datetime attribute of this element is used translate the time into a machine-readable format so that browsers can offer to add date reminders through the user's calendar, and search engines can produce smarter search results.
-open class Time: Tag {}
+open class Time: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Time {
     
diff --git a/Sources/SwiftHtml/Tags/Title.swift b/Sources/SwiftHtml/Tags/Title.swift
index 31de602..783c157 100644
--- a/Sources/SwiftHtml/Tags/Title.swift
+++ b/Sources/SwiftHtml/Tags/Title.swift
@@ -26,4 +26,7 @@
 /// So, try to make the title as accurate and meaningful as possible!
 ///
 /// **Note:** You can NOT have more than one `<title>` element in an HTML document.
-open class Title: Tag {}
+open class Title: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Tr.swift b/Sources/SwiftHtml/Tags/Tr.swift
index cc58fc6..ccea074 100644
--- a/Sources/SwiftHtml/Tags/Tr.swift
+++ b/Sources/SwiftHtml/Tags/Tr.swift
@@ -8,4 +8,7 @@
 /// The `<tr>` tag defines a row in an HTML table.
 ///
 /// A `<tr>` element contains one or more `<th>` or `<td>` elements.
-open class Tr: Tag {}
+open class Tr: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index 22aa8f6..fbc8c11 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -12,6 +12,8 @@
 /// Tracks are formatted in WebVTT format (.vtt files).
 open class Track: EmptyTag {
     
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    
     public init(src: String) {
         super.init()
         setAttributes([
diff --git a/Sources/SwiftHtml/Tags/U.swift b/Sources/SwiftHtml/Tags/U.swift
index e7814c5..f7a6d71 100644
--- a/Sources/SwiftHtml/Tags/U.swift
+++ b/Sources/SwiftHtml/Tags/U.swift
@@ -11,4 +11,7 @@
 /// You can change this with CSS (see example below).
 ///
 /// **Tip:** Avoid using the `<u>` element where it could be confused for a hyperlink!
-open class U: Tag {}
+open class U: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Ul.swift b/Sources/SwiftHtml/Tags/Ul.swift
index a37faf3..86ef5e6 100644
--- a/Sources/SwiftHtml/Tags/Ul.swift
+++ b/Sources/SwiftHtml/Tags/Ul.swift
@@ -12,4 +12,7 @@
 /// **Tip:** Use CSS to style lists.
 /// 
 /// **Tip:** For ordered lists, use the `<ol>` tag.
-open class Ul: Tag {}
+open class Ul: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Var.swift b/Sources/SwiftHtml/Tags/Var.swift
index e81889f..9be5e47 100644
--- a/Sources/SwiftHtml/Tags/Var.swift
+++ b/Sources/SwiftHtml/Tags/Var.swift
@@ -8,4 +8,7 @@
 /// The `<var>` tag is used to defines a variable in programming or in a mathematical expression. The content inside is typically displayed in italic.
 /// 
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
-open class Var: Tag {}
+open class Var: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftHtml/Tags/Video.swift b/Sources/SwiftHtml/Tags/Video.swift
index 4937225..df6f8f1 100644
--- a/Sources/SwiftHtml/Tags/Video.swift
+++ b/Sources/SwiftHtml/Tags/Video.swift
@@ -20,7 +20,10 @@
 ///     Firefox | YES | YES  | YES
 ///     Safari  | YES | YES  | NO
 ///     Opera   | YES | YES  | YES
-open class Video: Tag {}
+open class Video: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
 
 public extension Video {
     
diff --git a/Sources/SwiftHtml/Tags/Wbr.swift b/Sources/SwiftHtml/Tags/Wbr.swift
index 70d8802..2151556 100644
--- a/Sources/SwiftHtml/Tags/Wbr.swift
+++ b/Sources/SwiftHtml/Tags/Wbr.swift
@@ -8,4 +8,7 @@
 /// The `<wbr>` (Word Break Opportunity) tag specifies where in a text it would be ok to add a line-break.
 ///
 /// **Tip:** When a word is too long, the browser might break it at the wrong place. You can use the `<wbr>` element to add word break opportunities.
-open class Wbr: Tag {}
+open class Wbr: Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+}
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index d4f5c07..1b980d8 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -7,9 +7,7 @@
 
 open class EmptyTag: Tag {
     
-    open override class func createNode() -> Node {
-        Node(type: .empty, name: String(describing: self).lowercased())
-    }
+    override class var node: Node { .init(type: .empty, name: String(describing: self).lowercased()) }
 
     public init() {
         super.init()
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index 6a14aa7..35208c3 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -7,8 +7,6 @@
 
 
 open class GroupTag: Tag {
-
-    open override class func createNode() -> Node {
-        .init(type: .group)
-    }
+    
+    override class var node: Node { .init(type: .group) }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 04160ee..1cca869 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -6,19 +6,17 @@
 //
 
 open class Tag {
+    
+    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
 
     public private(set) var node: Node
     public private(set) var children: [Tag]
     
     // MARK: - init
     
-    open class func createNode() -> Node {
-        Node(type: .standard, name: String(describing: self).lowercased())
-    }
-    
     /// initialize a new Tag with child tags
     public init(node: Node? = nil, _ children: [Tag] = []) {
-        self.node = node ?? Self.createNode()
+        self.node = node ?? Self.node
         self.children = children
     }
 

From 7a9cb4969701893859d145055472740f43f35829 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sat, 8 Jul 2023 20:37:51 -0400
Subject: [PATCH 022/141] Fixing subclass <tag_name>

---
 Sources/SwiftHtml/Tags/A.swift          |  4 +-
 Sources/SwiftHtml/Tags/Abbr.swift       |  4 +-
 Sources/SwiftHtml/Tags/Address.swift    |  4 +-
 Sources/SwiftHtml/Tags/Area.swift       |  6 ++-
 Sources/SwiftHtml/Tags/Article.swift    |  4 +-
 Sources/SwiftHtml/Tags/Aside.swift      |  4 +-
 Sources/SwiftHtml/Tags/Audio.swift      |  4 +-
 Sources/SwiftHtml/Tags/B.swift          |  4 +-
 Sources/SwiftHtml/Tags/Base.swift       |  4 +-
 Sources/SwiftHtml/Tags/Bdi.swift        |  4 +-
 Sources/SwiftHtml/Tags/Bdo.swift        |  5 +--
 Sources/SwiftHtml/Tags/Blockquote.swift |  4 +-
 Sources/SwiftHtml/Tags/Body.swift       |  4 +-
 Sources/SwiftHtml/Tags/Br.swift         |  4 +-
 Sources/SwiftHtml/Tags/Button.swift     |  4 +-
 Sources/SwiftHtml/Tags/Canvas.swift     |  4 +-
 Sources/SwiftHtml/Tags/Caption.swift    |  4 +-
 Sources/SwiftHtml/Tags/Cite.swift       |  4 +-
 Sources/SwiftHtml/Tags/Code.swift       |  4 +-
 Sources/SwiftHtml/Tags/Col.swift        |  4 +-
 Sources/SwiftHtml/Tags/Colgroup.swift   |  4 +-
 Sources/SwiftHtml/Tags/Comment.swift    |  4 +-
 Sources/SwiftHtml/Tags/Data.swift       |  4 +-
 Sources/SwiftHtml/Tags/Datalist.swift   |  4 +-
 Sources/SwiftHtml/Tags/Dd.swift         |  4 +-
 Sources/SwiftHtml/Tags/Del.swift        |  4 +-
 Sources/SwiftHtml/Tags/Details.swift    |  4 +-
 Sources/SwiftHtml/Tags/Dfn.swift        |  4 +-
 Sources/SwiftHtml/Tags/Dialog.swift     |  4 +-
 Sources/SwiftHtml/Tags/Div.swift        |  4 +-
 Sources/SwiftHtml/Tags/Dl.swift         |  4 +-
 Sources/SwiftHtml/Tags/Dt.swift         |  4 +-
 Sources/SwiftHtml/Tags/Em.swift         |  4 +-
 Sources/SwiftHtml/Tags/Embed.swift      |  4 +-
 Sources/SwiftHtml/Tags/Fieldset.swift   |  4 +-
 Sources/SwiftHtml/Tags/Figcaption.swift |  4 +-
 Sources/SwiftHtml/Tags/Figure.swift     |  4 +-
 Sources/SwiftHtml/Tags/Footer.swift     |  4 +-
 Sources/SwiftHtml/Tags/Form.swift       |  4 +-
 Sources/SwiftHtml/Tags/H1.swift         |  4 +-
 Sources/SwiftHtml/Tags/H2.swift         |  4 +-
 Sources/SwiftHtml/Tags/H3.swift         |  4 +-
 Sources/SwiftHtml/Tags/H4.swift         |  4 +-
 Sources/SwiftHtml/Tags/H5.swift         |  4 +-
 Sources/SwiftHtml/Tags/H6.swift         |  4 +-
 Sources/SwiftHtml/Tags/Head.swift       |  4 +-
 Sources/SwiftHtml/Tags/Header.swift     |  4 +-
 Sources/SwiftHtml/Tags/Hr.swift         |  4 +-
 Sources/SwiftHtml/Tags/Html.swift       |  4 +-
 Sources/SwiftHtml/Tags/I.swift          |  4 +-
 Sources/SwiftHtml/Tags/Iframe.swift     |  4 +-
 Sources/SwiftHtml/Tags/Img.swift        |  4 +-
 Sources/SwiftHtml/Tags/Input.swift      |  4 +-
 Sources/SwiftHtml/Tags/Ins.swift        |  4 +-
 Sources/SwiftHtml/Tags/Kbd.swift        |  4 +-
 Sources/SwiftHtml/Tags/Label.swift      |  4 +-
 Sources/SwiftHtml/Tags/Legend.swift     |  4 +-
 Sources/SwiftHtml/Tags/Li.swift         |  4 +-
 Sources/SwiftHtml/Tags/Link.swift       |  4 +-
 Sources/SwiftHtml/Tags/MainTag.swift    |  4 +-
 Sources/SwiftHtml/Tags/Map.swift        |  6 +--
 Sources/SwiftHtml/Tags/Mark.swift       |  4 +-
 Sources/SwiftHtml/Tags/Meta.swift       |  4 +-
 Sources/SwiftHtml/Tags/Meter.swift      |  4 +-
 Sources/SwiftHtml/Tags/Nav.swift        |  4 +-
 Sources/SwiftHtml/Tags/Noscript.swift   |  4 +-
 Sources/SwiftHtml/Tags/Object.swift     |  4 +-
 Sources/SwiftHtml/Tags/Ol.swift         |  4 +-
 Sources/SwiftHtml/Tags/Optgroup.swift   |  4 +-
 Sources/SwiftHtml/Tags/Option.swift     |  4 +-
 Sources/SwiftHtml/Tags/Output.swift     |  4 +-
 Sources/SwiftHtml/Tags/P.swift          |  4 +-
 Sources/SwiftHtml/Tags/Param.swift      |  4 +-
 Sources/SwiftHtml/Tags/Picture.swift    |  4 +-
 Sources/SwiftHtml/Tags/Pre.swift        |  4 +-
 Sources/SwiftHtml/Tags/Progress.swift   |  4 +-
 Sources/SwiftHtml/Tags/Q.swift          |  4 +-
 Sources/SwiftHtml/Tags/Rp.swift         |  4 +-
 Sources/SwiftHtml/Tags/Rt.swift         |  4 +-
 Sources/SwiftHtml/Tags/Ruby.swift       |  4 +-
 Sources/SwiftHtml/Tags/S.swift          |  4 +-
 Sources/SwiftHtml/Tags/Samp.swift       |  4 +-
 Sources/SwiftHtml/Tags/Script.swift     |  4 +-
 Sources/SwiftHtml/Tags/Section.swift    |  4 +-
 Sources/SwiftHtml/Tags/Select.swift     |  4 +-
 Sources/SwiftHtml/Tags/Small.swift      |  4 +-
 Sources/SwiftHtml/Tags/Source.swift     |  4 +-
 Sources/SwiftHtml/Tags/Span.swift       |  4 +-
 Sources/SwiftHtml/Tags/Strong.swift     |  4 +-
 Sources/SwiftHtml/Tags/Style.swift      |  4 +-
 Sources/SwiftHtml/Tags/Sub.swift        |  4 +-
 Sources/SwiftHtml/Tags/Summary.swift    |  4 +-
 Sources/SwiftHtml/Tags/Sup.swift        |  4 +-
 Sources/SwiftHtml/Tags/Table.swift      |  4 +-
 Sources/SwiftHtml/Tags/Tbody.swift      |  4 +-
 Sources/SwiftHtml/Tags/Td.swift         |  4 +-
 Sources/SwiftHtml/Tags/Template.swift   |  4 +-
 Sources/SwiftHtml/Tags/Textarea.swift   |  4 +-
 Sources/SwiftHtml/Tags/Tfoot.swift      |  4 +-
 Sources/SwiftHtml/Tags/Th.swift         |  4 +-
 Sources/SwiftHtml/Tags/Thead.swift      |  4 +-
 Sources/SwiftHtml/Tags/Time.swift       |  4 +-
 Sources/SwiftHtml/Tags/Title.swift      |  4 +-
 Sources/SwiftHtml/Tags/Tr.swift         |  4 +-
 Sources/SwiftHtml/Tags/Track.swift      |  4 +-
 Sources/SwiftHtml/Tags/U.swift          |  4 +-
 Sources/SwiftHtml/Tags/Ul.swift         |  4 +-
 Sources/SwiftHtml/Tags/Var.swift        |  4 +-
 Sources/SwiftHtml/Tags/Video.swift      |  4 +-
 Sources/SwiftHtml/Tags/Wbr.swift        |  4 +-
 Sources/SwiftHtml/Text.swift            |  2 +-
 Sources/SwiftRss/Rss.swift              |  2 +-
 Sources/SwiftSgml/EmptyTag.swift        | 14 +++++--
 Sources/SwiftSgml/GroupTag.swift        | 13 ++++++-
 Sources/SwiftSgml/Tag.swift             | 20 +++++-----
 Sources/SwiftSgml/TagBuilder.swift      | 52 +++----------------------
 Sources/SwiftSitemap/SitemapIndex.swift |  2 +-
 Sources/SwiftSitemap/Url.swift          |  3 ++
 Sources/SwiftSitemap/UrlSet.swift       |  2 +-
 Sources/SwiftSvg/Ellipse.swift          |  2 +-
 Sources/SwiftSvg/Rect.swift             |  2 +-
 121 files changed, 365 insertions(+), 194 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index af0a715..d533f82 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -16,7 +16,9 @@
 /// - An active link is underlined and red
 open class A: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension A {
diff --git a/Sources/SwiftHtml/Tags/Abbr.swift b/Sources/SwiftHtml/Tags/Abbr.swift
index 29ea10a..65e4046 100644
--- a/Sources/SwiftHtml/Tags/Abbr.swift
+++ b/Sources/SwiftHtml/Tags/Abbr.swift
@@ -10,6 +10,8 @@
 /// **Tip:** Use the global title attribute to show the description for the abbreviation/acronym when you mouse over the element.
 open class Abbr: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Address.swift b/Sources/SwiftHtml/Tags/Address.swift
index ea6ae3c..cbb2be9 100644
--- a/Sources/SwiftHtml/Tags/Address.swift
+++ b/Sources/SwiftHtml/Tags/Address.swift
@@ -12,5 +12,7 @@
 /// The text in the `<address>` element usually renders in italic, and browsers will always add a line break before and after the `<address>` element.
 open class Address: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index e8d5a3e..a57b031 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -12,8 +12,6 @@
 /// **Note:** The usemap attribute in <img> is associated with the <map> element's name attribute, and creates a relationship between the image and the map.
 open class Area: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
-    
     public enum Rel: String {
         /// Links to an alternate version of the document (i.e. print page, translated or mirror)
         case alternate
@@ -52,6 +50,10 @@ open class Area: EmptyTag {
         /// Defines a polygonal region
         case poly
     }
+    
+    public init() {
+        super.init(name: Self.name)
+    }
 }
 
 public extension Area {
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index d9f1344..7f72659 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -26,6 +26,8 @@ public extension Node {
 /// However, you can use CSS to style the `<article>` element (see example below).
 open class Article: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Aside.swift b/Sources/SwiftHtml/Tags/Aside.swift
index 8a02b48..107aa93 100644
--- a/Sources/SwiftHtml/Tags/Aside.swift
+++ b/Sources/SwiftHtml/Tags/Aside.swift
@@ -15,6 +15,8 @@
 /// However, you can use CSS to style the `<aside>` element (see example below).
 open class Aside: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Audio.swift b/Sources/SwiftHtml/Tags/Audio.swift
index a72c697..6931e16 100644
--- a/Sources/SwiftHtml/Tags/Audio.swift
+++ b/Sources/SwiftHtml/Tags/Audio.swift
@@ -23,7 +23,9 @@
 ///      *From Edge 79
 open class Audio: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Audio {
diff --git a/Sources/SwiftHtml/Tags/B.swift b/Sources/SwiftHtml/Tags/B.swift
index e93c297..509063d 100644
--- a/Sources/SwiftHtml/Tags/B.swift
+++ b/Sources/SwiftHtml/Tags/B.swift
@@ -8,5 +8,7 @@
 /// Make some text bold (without marking it as important)
 open class B: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index ffe2a38..29d1c11 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -12,7 +12,9 @@
 /// There can only be one single `<base>` element in a document, and it must be inside the `<head>` element.
 open class Base: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public init() {
+        super.init(name: Self.name)
+    }
 }
 
 public extension Base {
diff --git a/Sources/SwiftHtml/Tags/Bdi.swift b/Sources/SwiftHtml/Tags/Bdi.swift
index b676c98..2dc918b 100644
--- a/Sources/SwiftHtml/Tags/Bdi.swift
+++ b/Sources/SwiftHtml/Tags/Bdi.swift
@@ -12,5 +12,7 @@
 /// This element is useful when embedding user-generated content with an unknown text direction.
 open class Bdi: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Bdo.swift b/Sources/SwiftHtml/Tags/Bdo.swift
index f7aa735..21a30b3 100644
--- a/Sources/SwiftHtml/Tags/Bdo.swift
+++ b/Sources/SwiftHtml/Tags/Bdo.swift
@@ -10,10 +10,9 @@
 /// The `<bdo>` tag is used to override the current text direction.
 open class Bdo: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
-
     public init(_ contents: String, dir: TextDirection = .ltr) {
-        super.init()
+        let node = Node(name: Self.name)
+        super.init(node: node)
         self.setAttributes([
             .init(key: "dir", value: dir.rawValue)
         ])
diff --git a/Sources/SwiftHtml/Tags/Blockquote.swift b/Sources/SwiftHtml/Tags/Blockquote.swift
index c0e342e..f845afe 100644
--- a/Sources/SwiftHtml/Tags/Blockquote.swift
+++ b/Sources/SwiftHtml/Tags/Blockquote.swift
@@ -10,7 +10,9 @@
 /// Browsers usually indent `<blockquote>` elements (look at example below to see how to remove the indentation).
 open class Blockquote: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Blockquote {
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index d0afe51..40d2a7f 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -12,5 +12,7 @@
 /// **Note:** There can only be one `<body>` element in an HTML document.
 open class Body: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index 67b3d23..e35c86b 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -12,5 +12,7 @@
 /// The `<br>` tag is an empty tag which means that it has no end tag.
 open class Br: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public init() {
+        super.init(name: Self.name)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Button.swift b/Sources/SwiftHtml/Tags/Button.swift
index 98e4704..56cc00f 100644
--- a/Sources/SwiftHtml/Tags/Button.swift
+++ b/Sources/SwiftHtml/Tags/Button.swift
@@ -14,7 +14,9 @@
 /// **Tip:** You can easily style buttons with CSS! Look at the examples below or visit our CSS Buttons tutorial.
 open class Button: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Button {
diff --git a/Sources/SwiftHtml/Tags/Canvas.swift b/Sources/SwiftHtml/Tags/Canvas.swift
index 3b86f17..ec8b451 100644
--- a/Sources/SwiftHtml/Tags/Canvas.swift
+++ b/Sources/SwiftHtml/Tags/Canvas.swift
@@ -12,7 +12,9 @@
 /// Any text inside the `<canvas>` element will be displayed in browsers with JavaScript disabled and in browsers that do not support <canvas>.
 open class Canvas: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Canvas {
diff --git a/Sources/SwiftHtml/Tags/Caption.swift b/Sources/SwiftHtml/Tags/Caption.swift
index 0ae95f4..89b0559 100644
--- a/Sources/SwiftHtml/Tags/Caption.swift
+++ b/Sources/SwiftHtml/Tags/Caption.swift
@@ -12,5 +12,7 @@
 /// **Tip:** By default, a table caption will be center-aligned above a table. However, the CSS properties text-align and caption-side can be used to align and place the caption.
 open class Caption: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Cite.swift b/Sources/SwiftHtml/Tags/Cite.swift
index 0e5df0e..2f6316e 100644
--- a/Sources/SwiftHtml/Tags/Cite.swift
+++ b/Sources/SwiftHtml/Tags/Cite.swift
@@ -12,5 +12,7 @@
 /// The text in the `<cite>` element usually renders in italic.
 open class Cite: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Code.swift b/Sources/SwiftHtml/Tags/Code.swift
index 1913acb..81267d3 100644
--- a/Sources/SwiftHtml/Tags/Code.swift
+++ b/Sources/SwiftHtml/Tags/Code.swift
@@ -16,5 +16,7 @@
 /// - `<pre>`    Defines preformatted text
 open class Code: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index 4797cf7..2f679a1 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -10,7 +10,9 @@
 /// The `<col>` tag is useful for applying styles to entire columns, instead of repeating the styles for each cell, for each row.
 open class Col: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public init() {
+        super.init(name: Self.name)
+    }
 }
 
 public extension Col {
diff --git a/Sources/SwiftHtml/Tags/Colgroup.swift b/Sources/SwiftHtml/Tags/Colgroup.swift
index c2aff10..5eca98a 100644
--- a/Sources/SwiftHtml/Tags/Colgroup.swift
+++ b/Sources/SwiftHtml/Tags/Colgroup.swift
@@ -14,7 +14,9 @@
 /// **Tip:** To define different properties to a column within a `<colgroup>`, use the `<col>` tag within the `<colgroup>` tag.
 open class Colgroup: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Colgroup {
diff --git a/Sources/SwiftHtml/Tags/Comment.swift b/Sources/SwiftHtml/Tags/Comment.swift
index 504011f..91bf3b2 100644
--- a/Sources/SwiftHtml/Tags/Comment.swift
+++ b/Sources/SwiftHtml/Tags/Comment.swift
@@ -14,10 +14,8 @@
 /// This is especially useful if you have a lot of code.
 open class Comment: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
-    
     public init(_ contents: String) {
-        super.init()
+        super.init(node: .init(name: Self.name))
         setContents(contents)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Data.swift b/Sources/SwiftHtml/Tags/Data.swift
index f0113a8..bfd695b 100644
--- a/Sources/SwiftHtml/Tags/Data.swift
+++ b/Sources/SwiftHtml/Tags/Data.swift
@@ -12,7 +12,9 @@
 /// **Tip:** If the content is time- or date-related, use the `<time>` element instead.
 open class Data: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Data {
diff --git a/Sources/SwiftHtml/Tags/Datalist.swift b/Sources/SwiftHtml/Tags/Datalist.swift
index c90cb93..a3eebbf 100644
--- a/Sources/SwiftHtml/Tags/Datalist.swift
+++ b/Sources/SwiftHtml/Tags/Datalist.swift
@@ -12,5 +12,7 @@
 /// The `<datalist>` element's id attribute must be equal to the `<input>` element's list attribute (this binds them together).
 open class Datalist: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Dd.swift b/Sources/SwiftHtml/Tags/Dd.swift
index 48c346c..acb046a 100644
--- a/Sources/SwiftHtml/Tags/Dd.swift
+++ b/Sources/SwiftHtml/Tags/Dd.swift
@@ -12,5 +12,7 @@
 /// Inside a `<dd>` tag you can put paragraphs, line breaks, images, links, lists, etc.
 open class Dd: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Del.swift b/Sources/SwiftHtml/Tags/Del.swift
index 1b8e845..537862a 100644
--- a/Sources/SwiftHtml/Tags/Del.swift
+++ b/Sources/SwiftHtml/Tags/Del.swift
@@ -10,7 +10,9 @@
 /// Browsers will usually strike a line through deleted text.
 open class Del: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Del {
diff --git a/Sources/SwiftHtml/Tags/Details.swift b/Sources/SwiftHtml/Tags/Details.swift
index 2847071..a03a1ff 100644
--- a/Sources/SwiftHtml/Tags/Details.swift
+++ b/Sources/SwiftHtml/Tags/Details.swift
@@ -14,7 +14,9 @@
 /// **Tip:** The `<summary>` tag is used in conjuction with `<details>` to specify a visible heading for the details.
 open class Details: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Details {
diff --git a/Sources/SwiftHtml/Tags/Dfn.swift b/Sources/SwiftHtml/Tags/Dfn.swift
index 9b37255..868f646 100644
--- a/Sources/SwiftHtml/Tags/Dfn.swift
+++ b/Sources/SwiftHtml/Tags/Dfn.swift
@@ -13,5 +13,7 @@
 /// `<p><dfn>HTML</dfn> is the standard markup language for creating web pages.</p>`
 open class Dfn: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Dialog.swift b/Sources/SwiftHtml/Tags/Dialog.swift
index 9729ada..975aed5 100644
--- a/Sources/SwiftHtml/Tags/Dialog.swift
+++ b/Sources/SwiftHtml/Tags/Dialog.swift
@@ -10,7 +10,9 @@
 /// The `<dialog>` element makes it easy to create popup dialogs and modals on a web page.
 open class Dialog: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Dialog {
diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index 7dc78f6..c2dd207 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -16,7 +16,9 @@
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
 open class Div: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Dl.swift b/Sources/SwiftHtml/Tags/Dl.swift
index c5b218e..6ed4952 100644
--- a/Sources/SwiftHtml/Tags/Dl.swift
+++ b/Sources/SwiftHtml/Tags/Dl.swift
@@ -10,5 +10,7 @@
 /// The `<dl>` tag is used in conjunction with `<dt>` (defines terms/names) and `<dd>` (describes each term/name).
 open class Dl: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Dt.swift b/Sources/SwiftHtml/Tags/Dt.swift
index 3e5f53e..1847b89 100644
--- a/Sources/SwiftHtml/Tags/Dt.swift
+++ b/Sources/SwiftHtml/Tags/Dt.swift
@@ -10,5 +10,7 @@
 /// The `<dt>` tag is used in conjunction with `<dl>` (defines a description list) and `<dd>` (describes each term/name).
 open class Dt: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Em.swift b/Sources/SwiftHtml/Tags/Em.swift
index c473f55..e2f5fe9 100644
--- a/Sources/SwiftHtml/Tags/Em.swift
+++ b/Sources/SwiftHtml/Tags/Em.swift
@@ -10,5 +10,7 @@
 /// A screen reader will pronounce the words in `<em>` with an emphasis, using verbal stress.
 open class Em: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index a51e948..ff97654 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -8,7 +8,9 @@
 /// The `<embed>` tag defines a container for an external resource, such as a web page, a picture, a media player, or a plug-in application.
 open class Embed: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public init() {
+        super.init(name: Self.name)
+    }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Fieldset.swift b/Sources/SwiftHtml/Tags/Fieldset.swift
index 7016898..50fdcfd 100644
--- a/Sources/SwiftHtml/Tags/Fieldset.swift
+++ b/Sources/SwiftHtml/Tags/Fieldset.swift
@@ -10,7 +10,9 @@
 /// The `<fieldset>` tag draws a box around the related elements.
 open class Fieldset: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Fieldset {
diff --git a/Sources/SwiftHtml/Tags/Figcaption.swift b/Sources/SwiftHtml/Tags/Figcaption.swift
index a908fae..f860bd2 100644
--- a/Sources/SwiftHtml/Tags/Figcaption.swift
+++ b/Sources/SwiftHtml/Tags/Figcaption.swift
@@ -10,5 +10,7 @@
 /// The `<figcaption>` element can be placed as the first or last child of the `<figure>` element.
 open class Figcaption: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Figure.swift b/Sources/SwiftHtml/Tags/Figure.swift
index 76628d3..12445f4 100644
--- a/Sources/SwiftHtml/Tags/Figure.swift
+++ b/Sources/SwiftHtml/Tags/Figure.swift
@@ -12,6 +12,8 @@
 /// **Tip:** The `<figcaption>` element is used to add a caption for the `<figure>` element.
 open class Figure: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Footer.swift b/Sources/SwiftHtml/Tags/Footer.swift
index 4002857..1279d8f 100644
--- a/Sources/SwiftHtml/Tags/Footer.swift
+++ b/Sources/SwiftHtml/Tags/Footer.swift
@@ -18,5 +18,7 @@
 /// You can have several `<footer>` elements in one document.
 open class Footer: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Form.swift b/Sources/SwiftHtml/Tags/Form.swift
index aca3700..424ff53 100644
--- a/Sources/SwiftHtml/Tags/Form.swift
+++ b/Sources/SwiftHtml/Tags/Form.swift
@@ -20,7 +20,9 @@
 /// - `<output>`
 open class Form: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Form {
diff --git a/Sources/SwiftHtml/Tags/H1.swift b/Sources/SwiftHtml/Tags/H1.swift
index 5df0602..d924df2 100644
--- a/Sources/SwiftHtml/Tags/H1.swift
+++ b/Sources/SwiftHtml/Tags/H1.swift
@@ -13,5 +13,7 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H1: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/H2.swift b/Sources/SwiftHtml/Tags/H2.swift
index 10616b3..e496297 100644
--- a/Sources/SwiftHtml/Tags/H2.swift
+++ b/Sources/SwiftHtml/Tags/H2.swift
@@ -13,5 +13,7 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H2: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/H3.swift b/Sources/SwiftHtml/Tags/H3.swift
index 12ad78c..e6e9dcc 100644
--- a/Sources/SwiftHtml/Tags/H3.swift
+++ b/Sources/SwiftHtml/Tags/H3.swift
@@ -13,5 +13,7 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H3: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/H4.swift b/Sources/SwiftHtml/Tags/H4.swift
index a3021e5..88c91d0 100644
--- a/Sources/SwiftHtml/Tags/H4.swift
+++ b/Sources/SwiftHtml/Tags/H4.swift
@@ -13,5 +13,7 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H4: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/H5.swift b/Sources/SwiftHtml/Tags/H5.swift
index 84640da..79ff5ba 100644
--- a/Sources/SwiftHtml/Tags/H5.swift
+++ b/Sources/SwiftHtml/Tags/H5.swift
@@ -13,5 +13,7 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H5: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/H6.swift b/Sources/SwiftHtml/Tags/H6.swift
index 2aaed88..c80a2f9 100644
--- a/Sources/SwiftHtml/Tags/H6.swift
+++ b/Sources/SwiftHtml/Tags/H6.swift
@@ -13,5 +13,7 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H6: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index 15912e8..f74c558 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -22,5 +22,7 @@
 /// - `<noscript>`
 open class Head: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Header.swift b/Sources/SwiftHtml/Tags/Header.swift
index 3e27efc..7f3b65b 100644
--- a/Sources/SwiftHtml/Tags/Header.swift
+++ b/Sources/SwiftHtml/Tags/Header.swift
@@ -15,6 +15,8 @@
 /// **Note:** You can have several` <header>` elements in one HTML document. However,` <header>` cannot be placed within a` <footer>`,` <address>` or another` <header>` element.
 open class Header: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index d56e556..e8ffce8 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -10,5 +10,7 @@
 /// The `<hr>` element is most often displayed as a horizontal rule that is used to separate content (or define a change) in an HTML page.
 open class Hr: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public init() {
+        super.init(name: Self.name)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 6af532a..a6ece5e 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -12,7 +12,9 @@
 /// **Note:** You should always include the lang attribute inside the `<html>` tag, to declare the language of the Web page. This is meant to assist search engines and browsers.
 open class Html: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Html {
diff --git a/Sources/SwiftHtml/Tags/I.swift b/Sources/SwiftHtml/Tags/I.swift
index 2c085e2..dfd7e35 100644
--- a/Sources/SwiftHtml/Tags/I.swift
+++ b/Sources/SwiftHtml/Tags/I.swift
@@ -18,5 +18,7 @@
 /// - `<dfn>` (a definition term)
 open class I: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Iframe.swift b/Sources/SwiftHtml/Tags/Iframe.swift
index 56cc7cb..ab56f44 100644
--- a/Sources/SwiftHtml/Tags/Iframe.swift
+++ b/Sources/SwiftHtml/Tags/Iframe.swift
@@ -14,7 +14,9 @@
 /// **Tip:** It is a good practice to always include a title attribute for the `<iframe>`. This is used by screen readers to read out what the content of the `<iframe>` is.
 open class Iframe: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Iframe {
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index 61149be..b631689 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -20,10 +20,8 @@
 /// **Tip:** To link an image to another document, simply nest the `<img>` tag inside an `<a>` tag (see example below).
 open class Img: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
-
     public init(src: String, alt: String) {
-        super.init()
+        super.init(name: Self.name)
         setAttributes([
             .init(key: "src", value: src),
             .init(key: "alt", value: alt),
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index 8550990..3b01e59 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -12,7 +12,9 @@
 /// The `<input>` element can be displayed in several ways, depending on the type attribute.
 open class Input: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public init() {
+        super.init(name: Self.name)
+    }
 }
 
 public extension Input {
diff --git a/Sources/SwiftHtml/Tags/Ins.swift b/Sources/SwiftHtml/Tags/Ins.swift
index bb70675..6aad676 100644
--- a/Sources/SwiftHtml/Tags/Ins.swift
+++ b/Sources/SwiftHtml/Tags/Ins.swift
@@ -10,5 +10,7 @@
 /// **Tip:** Also look at the `<del>` tag to markup deleted text.
 open class Ins: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Kbd.swift b/Sources/SwiftHtml/Tags/Kbd.swift
index 994f14e..223d335 100644
--- a/Sources/SwiftHtml/Tags/Kbd.swift
+++ b/Sources/SwiftHtml/Tags/Kbd.swift
@@ -10,5 +10,7 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS (see example below).
 open class Kbd: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Label.swift b/Sources/SwiftHtml/Tags/Label.swift
index d4b5c34..8b8d026 100644
--- a/Sources/SwiftHtml/Tags/Label.swift
+++ b/Sources/SwiftHtml/Tags/Label.swift
@@ -35,7 +35,9 @@
 /// Users who have difficulty clicking on very small regions (such as checkboxes) - because when a user clicks the text within the `<label>` element, it toggles the input (this increases the hit area).
 open class Label: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Label {
diff --git a/Sources/SwiftHtml/Tags/Legend.swift b/Sources/SwiftHtml/Tags/Legend.swift
index efa6bb9..3c0b9af 100644
--- a/Sources/SwiftHtml/Tags/Legend.swift
+++ b/Sources/SwiftHtml/Tags/Legend.swift
@@ -8,5 +8,7 @@
 /// The `<legend>` tag defines a caption for the `<fieldset>` element.
 open class Legend: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Li.swift b/Sources/SwiftHtml/Tags/Li.swift
index 69bfc8a..0dd0a0e 100644
--- a/Sources/SwiftHtml/Tags/Li.swift
+++ b/Sources/SwiftHtml/Tags/Li.swift
@@ -16,7 +16,9 @@
 /// **Tip:** Use CSS to style lists.
 open class Li: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Li {
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index b525010..cb7b96a 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -12,10 +12,8 @@
 /// The `<link>` element is an empty element, it contains attributes only.
 open class Link: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
-
     public init(rel: Rel) {
-        super.init()
+        super.init(name: Self.name)
         setAttributes([
             Attribute(key: "rel", value: rel.rawValue),
         ])
diff --git a/Sources/SwiftHtml/Tags/MainTag.swift b/Sources/SwiftHtml/Tags/MainTag.swift
index 1fa1513..3d0c950 100644
--- a/Sources/SwiftHtml/Tags/MainTag.swift
+++ b/Sources/SwiftHtml/Tags/MainTag.swift
@@ -12,7 +12,9 @@
 /// **Note:** There must not be more than one `<main>` element in a document. The `<main>` element must NOT be a descendant of an `<article>`, `<aside>`, `<footer>`, `<header>`, or `<nav>` element.
 open class Main: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index 730263c..d54dfaa 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -11,11 +11,9 @@
 ///
 /// The `<map>` element contains a number of `<area>` elements, that defines the clickable areas in the image map.
 open class Map: Tag {
-    
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
-
+        
     public init(name: String, @TagBuilder _ builder: () -> Tag) {
-        super.init([builder()])
+        super.init(node: .init(name: Self.name), [builder()])
         setAttributes([
             .init(key: "name", value: name)
         ])
diff --git a/Sources/SwiftHtml/Tags/Mark.swift b/Sources/SwiftHtml/Tags/Mark.swift
index 5333d3f..013e8f9 100644
--- a/Sources/SwiftHtml/Tags/Mark.swift
+++ b/Sources/SwiftHtml/Tags/Mark.swift
@@ -8,5 +8,7 @@
 /// The `<mark>` tag defines text that should be marked or highlighted.
 open class Mark: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index 418dd04..61746a2 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -16,7 +16,9 @@
 /// There is a method to let web designers take control over the viewport (the user's visible area of a web page), through the `<meta>` tag (See "Setting The Viewport" example below).
 open class Meta: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public init() {
+        super.init(name: Self.name)
+    }
 }
 
 public extension Meta {
diff --git a/Sources/SwiftHtml/Tags/Meter.swift b/Sources/SwiftHtml/Tags/Meter.swift
index a7d9065..25ec9a4 100644
--- a/Sources/SwiftHtml/Tags/Meter.swift
+++ b/Sources/SwiftHtml/Tags/Meter.swift
@@ -14,10 +14,8 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Meter: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
-    
     public init(value: Int, _ contents: String) {
-        super.init()
+        super.init(node: .init(name: Self.name))
         setContents(contents)
         setAttributes([
             .init(key: "value", value: String(value))
diff --git a/Sources/SwiftHtml/Tags/Nav.swift b/Sources/SwiftHtml/Tags/Nav.swift
index 1cd88fb..8bd9c3c 100644
--- a/Sources/SwiftHtml/Tags/Nav.swift
+++ b/Sources/SwiftHtml/Tags/Nav.swift
@@ -12,7 +12,9 @@
 /// Browsers, such as screen readers for disabled users, can use this element to determine whether to omit the initial rendering of this content.
 open class Nav: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Noscript.swift b/Sources/SwiftHtml/Tags/Noscript.swift
index d85ea1b..8e19ab3 100644
--- a/Sources/SwiftHtml/Tags/Noscript.swift
+++ b/Sources/SwiftHtml/Tags/Noscript.swift
@@ -10,5 +10,7 @@
 /// The `<noscript>` element can be used in both `<head>` and `<body>`. When used inside `<head>`, the `<noscript>` element could only contain `<link>`, `<style>`, and `<meta>` elements.
 open class Noscript: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Object.swift b/Sources/SwiftHtml/Tags/Object.swift
index 76c3548..a1f3353 100644
--- a/Sources/SwiftHtml/Tags/Object.swift
+++ b/Sources/SwiftHtml/Tags/Object.swift
@@ -10,7 +10,9 @@
 /// The external resource can be a web page, a picture, a media player, or a plug-in application.
 open class Object: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Object {
diff --git a/Sources/SwiftHtml/Tags/Ol.swift b/Sources/SwiftHtml/Tags/Ol.swift
index bf59fa6..4704809 100644
--- a/Sources/SwiftHtml/Tags/Ol.swift
+++ b/Sources/SwiftHtml/Tags/Ol.swift
@@ -14,7 +14,9 @@
 /// **Tip:** For unordered list, use the `<ul>` tag.
 open class Ol: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Ol {
diff --git a/Sources/SwiftHtml/Tags/Optgroup.swift b/Sources/SwiftHtml/Tags/Optgroup.swift
index 943284e..388942f 100644
--- a/Sources/SwiftHtml/Tags/Optgroup.swift
+++ b/Sources/SwiftHtml/Tags/Optgroup.swift
@@ -10,7 +10,9 @@
 /// If you have a long list of options, groups of related options are easier to handle for a user.
 open class Optgroup: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Optgroup {
diff --git a/Sources/SwiftHtml/Tags/Option.swift b/Sources/SwiftHtml/Tags/Option.swift
index 9a7d5a3..dd92302 100644
--- a/Sources/SwiftHtml/Tags/Option.swift
+++ b/Sources/SwiftHtml/Tags/Option.swift
@@ -14,7 +14,9 @@
 /// **Tip:** If you have a long list of options, you can group related options within the `<optgroup>` tag.
 open class Option: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Option {
diff --git a/Sources/SwiftHtml/Tags/Output.swift b/Sources/SwiftHtml/Tags/Output.swift
index 85cd1e2..4906ce1 100644
--- a/Sources/SwiftHtml/Tags/Output.swift
+++ b/Sources/SwiftHtml/Tags/Output.swift
@@ -8,7 +8,9 @@
 /// The `<output>` tag is used to represent the result of a calculation (like one performed by a script).
 open class Output: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Output {
diff --git a/Sources/SwiftHtml/Tags/P.swift b/Sources/SwiftHtml/Tags/P.swift
index 8dbec53..01e1355 100644
--- a/Sources/SwiftHtml/Tags/P.swift
+++ b/Sources/SwiftHtml/Tags/P.swift
@@ -12,5 +12,7 @@
 /// **Tip:** Use CSS to style paragraphs.
 open class P: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index eb85efe..33cdb93 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -8,7 +8,9 @@
 /// The `<param>` tag is used to define parameters for an `<object>` element.
 open class Param: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public init() {
+        super.init(name: Self.name)
+    }
 }
 
 public extension Param {
diff --git a/Sources/SwiftHtml/Tags/Picture.swift b/Sources/SwiftHtml/Tags/Picture.swift
index d4dbdcc..41c19ea 100644
--- a/Sources/SwiftHtml/Tags/Picture.swift
+++ b/Sources/SwiftHtml/Tags/Picture.swift
@@ -18,5 +18,7 @@
 /// **Tip:** The `<picture>` element works "similar" to `<video>` and `<audio>`. You set up different sources, and the first source that fits the preferences is the one being used.
 open class Picture: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Pre.swift b/Sources/SwiftHtml/Tags/Pre.swift
index f3967fb..59d081a 100644
--- a/Sources/SwiftHtml/Tags/Pre.swift
+++ b/Sources/SwiftHtml/Tags/Pre.swift
@@ -11,5 +11,7 @@
 /// The text will be displayed exactly as written in the HTML source code.
 open class Pre: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Progress.swift b/Sources/SwiftHtml/Tags/Progress.swift
index 3a4af2b..117db3d 100644
--- a/Sources/SwiftHtml/Tags/Progress.swift
+++ b/Sources/SwiftHtml/Tags/Progress.swift
@@ -10,7 +10,9 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Progress: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Progress {
diff --git a/Sources/SwiftHtml/Tags/Q.swift b/Sources/SwiftHtml/Tags/Q.swift
index 0c538cf..dbb017d 100644
--- a/Sources/SwiftHtml/Tags/Q.swift
+++ b/Sources/SwiftHtml/Tags/Q.swift
@@ -12,7 +12,9 @@
 /// **Tip:** Use `<blockquote>` for long quotations.
 open class Q: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Q {
diff --git a/Sources/SwiftHtml/Tags/Rp.swift b/Sources/SwiftHtml/Tags/Rp.swift
index 45eb5bb..2147784 100644
--- a/Sources/SwiftHtml/Tags/Rp.swift
+++ b/Sources/SwiftHtml/Tags/Rp.swift
@@ -10,5 +10,7 @@
 /// Use `<rp>` together with `<ruby>` and `<rt>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rp: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Rt.swift b/Sources/SwiftHtml/Tags/Rt.swift
index 266d9a9..a82f415 100644
--- a/Sources/SwiftHtml/Tags/Rt.swift
+++ b/Sources/SwiftHtml/Tags/Rt.swift
@@ -10,5 +10,7 @@
 /// Use `<rt>` together with `<ruby>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rt: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Ruby.swift b/Sources/SwiftHtml/Tags/Ruby.swift
index 992b765..25ed63d 100644
--- a/Sources/SwiftHtml/Tags/Ruby.swift
+++ b/Sources/SwiftHtml/Tags/Ruby.swift
@@ -12,5 +12,7 @@
 /// Use `<ruby>` together with `<rt>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that do not support ruby annotations.
 open class Ruby: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/S.swift b/Sources/SwiftHtml/Tags/S.swift
index e1e6060..83837e5 100644
--- a/Sources/SwiftHtml/Tags/S.swift
+++ b/Sources/SwiftHtml/Tags/S.swift
@@ -10,5 +10,7 @@
 /// The `<s>` tag should not be used to define deleted text in a document, use the `<del>` tag for that.
 open class S: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Samp.swift b/Sources/SwiftHtml/Tags/Samp.swift
index 82b574c..405b21a 100644
--- a/Sources/SwiftHtml/Tags/Samp.swift
+++ b/Sources/SwiftHtml/Tags/Samp.swift
@@ -10,5 +10,7 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Samp: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Script.swift b/Sources/SwiftHtml/Tags/Script.swift
index 0d899ec..e5bef25 100644
--- a/Sources/SwiftHtml/Tags/Script.swift
+++ b/Sources/SwiftHtml/Tags/Script.swift
@@ -12,7 +12,9 @@
 /// Common uses for JavaScript are image manipulation, form validation, and dynamic changes of content.
 open class Script: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
     
     public enum `Type`: String {
         case javascript = "text/javascript"
diff --git a/Sources/SwiftHtml/Tags/Section.swift b/Sources/SwiftHtml/Tags/Section.swift
index 7ac0a61..f4db449 100644
--- a/Sources/SwiftHtml/Tags/Section.swift
+++ b/Sources/SwiftHtml/Tags/Section.swift
@@ -8,5 +8,7 @@
 /// The `<section>` tag defines a section in a document.
 open class Section: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Select.swift b/Sources/SwiftHtml/Tags/Select.swift
index d3c0319..ed90991 100644
--- a/Sources/SwiftHtml/Tags/Select.swift
+++ b/Sources/SwiftHtml/Tags/Select.swift
@@ -18,7 +18,9 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Select: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Select {
diff --git a/Sources/SwiftHtml/Tags/Small.swift b/Sources/SwiftHtml/Tags/Small.swift
index fcaf2b4..26d6feb 100644
--- a/Sources/SwiftHtml/Tags/Small.swift
+++ b/Sources/SwiftHtml/Tags/Small.swift
@@ -10,5 +10,7 @@
 /// **Tip:** This tag is not deprecated, but it is possible to achieve richer (or the same) effect with CSS.
 open class Small: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index 84108f3..5cc8ad0 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -12,7 +12,9 @@
 /// The browser will choose the first `<source>` it supports.
 open class Source: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public init() {
+        super.init(name: Self.name)
+    }
 }
 
 public extension Source {
diff --git a/Sources/SwiftHtml/Tags/Span.swift b/Sources/SwiftHtml/Tags/Span.swift
index 7031ba8..4dbd3cc 100644
--- a/Sources/SwiftHtml/Tags/Span.swift
+++ b/Sources/SwiftHtml/Tags/Span.swift
@@ -12,5 +12,7 @@
 /// The `<span>` tag is much like the `<div>` element, but `<div>` is a block-level element and `<span>` is an inline element.
 open class Span: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Strong.swift b/Sources/SwiftHtml/Tags/Strong.swift
index ff00b55..49af193 100644
--- a/Sources/SwiftHtml/Tags/Strong.swift
+++ b/Sources/SwiftHtml/Tags/Strong.swift
@@ -10,5 +10,7 @@
 /// **Tip:** Use the `<b>` tag to specify bold text without any extra importance!
 open class Strong: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Style.swift b/Sources/SwiftHtml/Tags/Style.swift
index 31ae32e..89efdb3 100644
--- a/Sources/SwiftHtml/Tags/Style.swift
+++ b/Sources/SwiftHtml/Tags/Style.swift
@@ -11,7 +11,9 @@
 /// Inside the `<style>` element you specify how HTML elements should render in a browser.
 open class Style: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Style {
diff --git a/Sources/SwiftHtml/Tags/Sub.swift b/Sources/SwiftHtml/Tags/Sub.swift
index c9cd88d..5b7ca73 100644
--- a/Sources/SwiftHtml/Tags/Sub.swift
+++ b/Sources/SwiftHtml/Tags/Sub.swift
@@ -13,5 +13,7 @@
 /// **Tip:** Use the `<sup>` tag to define superscripted text.
 open class Sub: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Summary.swift b/Sources/SwiftHtml/Tags/Summary.swift
index b5b37e3..ad0f97f 100644
--- a/Sources/SwiftHtml/Tags/Summary.swift
+++ b/Sources/SwiftHtml/Tags/Summary.swift
@@ -10,5 +10,7 @@
 /// **Note:** The `<summary>` element should be the first child element of the `<details>` element.
 open class Summary: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Sup.swift b/Sources/SwiftHtml/Tags/Sup.swift
index 022bbd8..a43258d 100644
--- a/Sources/SwiftHtml/Tags/Sup.swift
+++ b/Sources/SwiftHtml/Tags/Sup.swift
@@ -13,5 +13,7 @@
 /// **Tip:** Use the `<sub>` tag to define subscript text.
 open class Sup: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Table.swift b/Sources/SwiftHtml/Tags/Table.swift
index 034a09b..c4b2f41 100644
--- a/Sources/SwiftHtml/Tags/Table.swift
+++ b/Sources/SwiftHtml/Tags/Table.swift
@@ -14,5 +14,7 @@
 /// An HTML table may also include `<caption>`, `<colgroup>`, `<thead>`, `<tfoot>`, and `<tbody>` elements.
 open class Table: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Tbody.swift b/Sources/SwiftHtml/Tags/Tbody.swift
index 47ff20f..f5d6460 100644
--- a/Sources/SwiftHtml/Tags/Tbody.swift
+++ b/Sources/SwiftHtml/Tags/Tbody.swift
@@ -19,6 +19,8 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tbody: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Td.swift b/Sources/SwiftHtml/Tags/Td.swift
index 0e9d974..c0ddde7 100644
--- a/Sources/SwiftHtml/Tags/Td.swift
+++ b/Sources/SwiftHtml/Tags/Td.swift
@@ -17,7 +17,9 @@
 /// The text in `<th>` elements are bold and centered by default.
 open class Td: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Td {
diff --git a/Sources/SwiftHtml/Tags/Template.swift b/Sources/SwiftHtml/Tags/Template.swift
index 5f19d41..4d34bb0 100644
--- a/Sources/SwiftHtml/Tags/Template.swift
+++ b/Sources/SwiftHtml/Tags/Template.swift
@@ -13,7 +13,9 @@
 /// To do this without the `<template>` tag, you have to create the HTML code with JavaScript to prevent the browser from rendering the code.
 open class Template: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Textarea.swift b/Sources/SwiftHtml/Tags/Textarea.swift
index 0d23eff..da0713f 100644
--- a/Sources/SwiftHtml/Tags/Textarea.swift
+++ b/Sources/SwiftHtml/Tags/Textarea.swift
@@ -20,7 +20,9 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Textarea: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Textarea {
diff --git a/Sources/SwiftHtml/Tags/Tfoot.swift b/Sources/SwiftHtml/Tags/Tfoot.swift
index baafe34..13c64fb 100644
--- a/Sources/SwiftHtml/Tags/Tfoot.swift
+++ b/Sources/SwiftHtml/Tags/Tfoot.swift
@@ -19,5 +19,7 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tfoot: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Th.swift b/Sources/SwiftHtml/Tags/Th.swift
index d58ca43..35413fa 100644
--- a/Sources/SwiftHtml/Tags/Th.swift
+++ b/Sources/SwiftHtml/Tags/Th.swift
@@ -17,7 +17,9 @@
 /// The text in `<td>` elements are regular and left-aligned by default.
 open class Th: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Th {
diff --git a/Sources/SwiftHtml/Tags/Thead.swift b/Sources/SwiftHtml/Tags/Thead.swift
index e8ec2a1..493c1fc 100644
--- a/Sources/SwiftHtml/Tags/Thead.swift
+++ b/Sources/SwiftHtml/Tags/Thead.swift
@@ -19,5 +19,7 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Thead: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Time.swift b/Sources/SwiftHtml/Tags/Time.swift
index 797d7a7..04e27bd 100644
--- a/Sources/SwiftHtml/Tags/Time.swift
+++ b/Sources/SwiftHtml/Tags/Time.swift
@@ -10,7 +10,9 @@
 /// The datetime attribute of this element is used translate the time into a machine-readable format so that browsers can offer to add date reminders through the user's calendar, and search engines can produce smarter search results.
 open class Time: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Time {
diff --git a/Sources/SwiftHtml/Tags/Title.swift b/Sources/SwiftHtml/Tags/Title.swift
index 783c157..21c95d9 100644
--- a/Sources/SwiftHtml/Tags/Title.swift
+++ b/Sources/SwiftHtml/Tags/Title.swift
@@ -28,5 +28,7 @@
 /// **Note:** You can NOT have more than one `<title>` element in an HTML document.
 open class Title: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Tr.swift b/Sources/SwiftHtml/Tags/Tr.swift
index ccea074..b4f6b76 100644
--- a/Sources/SwiftHtml/Tags/Tr.swift
+++ b/Sources/SwiftHtml/Tags/Tr.swift
@@ -10,5 +10,7 @@
 /// A `<tr>` element contains one or more `<th>` or `<td>` elements.
 open class Tr: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index fbc8c11..9a7404a 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -12,10 +12,8 @@
 /// Tracks are formatted in WebVTT format (.vtt files).
 open class Track: EmptyTag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
-    
     public init(src: String) {
-        super.init()
+        super.init(name: Self.name)
         setAttributes([
             .init(key: "src", value: src)
         ])
diff --git a/Sources/SwiftHtml/Tags/U.swift b/Sources/SwiftHtml/Tags/U.swift
index f7a6d71..b3ce08e 100644
--- a/Sources/SwiftHtml/Tags/U.swift
+++ b/Sources/SwiftHtml/Tags/U.swift
@@ -13,5 +13,7 @@
 /// **Tip:** Avoid using the `<u>` element where it could be confused for a hyperlink!
 open class U: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Ul.swift b/Sources/SwiftHtml/Tags/Ul.swift
index 86ef5e6..649e8d9 100644
--- a/Sources/SwiftHtml/Tags/Ul.swift
+++ b/Sources/SwiftHtml/Tags/Ul.swift
@@ -14,5 +14,7 @@
 /// **Tip:** For ordered lists, use the `<ol>` tag.
 open class Ul: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Var.swift b/Sources/SwiftHtml/Tags/Var.swift
index 9be5e47..e90ed5e 100644
--- a/Sources/SwiftHtml/Tags/Var.swift
+++ b/Sources/SwiftHtml/Tags/Var.swift
@@ -10,5 +10,7 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Var: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Video.swift b/Sources/SwiftHtml/Tags/Video.swift
index df6f8f1..913b86f 100644
--- a/Sources/SwiftHtml/Tags/Video.swift
+++ b/Sources/SwiftHtml/Tags/Video.swift
@@ -22,7 +22,9 @@
 ///     Opera   | YES | YES  | YES
 open class Video: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
 
 public extension Video {
diff --git a/Sources/SwiftHtml/Tags/Wbr.swift b/Sources/SwiftHtml/Tags/Wbr.swift
index 2151556..dd55720 100644
--- a/Sources/SwiftHtml/Tags/Wbr.swift
+++ b/Sources/SwiftHtml/Tags/Wbr.swift
@@ -10,5 +10,7 @@
 /// **Tip:** When a word is too long, the browser might break it at the wrong place. You can use the `<wbr>` element to add word break opportunities.
 open class Wbr: Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
+    public override init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftHtml/Text.swift b/Sources/SwiftHtml/Text.swift
index 0745742..50e68bf 100644
--- a/Sources/SwiftHtml/Text.swift
+++ b/Sources/SwiftHtml/Text.swift
@@ -9,7 +9,7 @@
 open class Text: GroupTag {
     
     public init(_ contents: String) {
-        super.init()
+        super.init(name: Self.name) {}
         setContents(contents)
     }
 }
diff --git a/Sources/SwiftRss/Rss.swift b/Sources/SwiftRss/Rss.swift
index 0d48f81..413c2f4 100644
--- a/Sources/SwiftRss/Rss.swift
+++ b/Sources/SwiftRss/Rss.swift
@@ -9,7 +9,7 @@
 open class Rss: Tag {
     
     public init(@TagBuilder _ builder: () -> Tag) {
-        super.init([builder()])
+        super.init(node: .init(name: Self.name), [builder()])
         setAttributes([
             .init(key: "version", value: "2.0"),
 //            .init(key: "xmlns:atom", value: "http://www.w3.org/2005/Atom"),
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index 1b980d8..d697f5c 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -7,9 +7,15 @@
 
 open class EmptyTag: Tag {
     
-    override class var node: Node { .init(type: .empty, name: String(describing: self).lowercased()) }
+    static var type: Node.NodeType { .empty }
 
-    public init() {
-        super.init()
-    }
+    public init(name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute] = []) {
+        let node = Node(type: Self.type,
+                        name: name,
+                        contents: contents,
+                        attributes: attributes)
+        super.init(node: node, [])
+    }    
 }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index 35208c3..651b392 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -8,5 +8,16 @@
 
 open class GroupTag: Tag {
     
-    override class var node: Node { .init(type: .group) }
+    static var type: Node.NodeType { .group }
+    
+    public init(name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute] = [],
+                @TagBuilder _ builder: () -> Tag) {
+        let node = Node(type: Self.type,
+                        name: name,
+                        contents: contents,
+                        attributes: attributes)
+        super.init(node: node, [builder()])
+    }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 1cca869..6a42c79 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -7,32 +7,32 @@
 
 open class Tag {
     
-    class var node: Node { .init(type: .standard, name: String(describing: self).lowercased()) }
-
+    public class var name: String { String(describing: self).lowercased() }
+        
     public private(set) var node: Node
     public private(set) var children: [Tag]
     
     // MARK: - init
-    
+        
     /// initialize a new Tag with child tags
     public init(node: Node? = nil, _ children: [Tag] = []) {
-        self.node = node ?? Self.node
+        self.node = node ?? .init()
         self.children = children
     }
 
     /// initialize a new Tag with a single child tag
-    public convenience init(_ child: Tag) {
-        self.init([child])
+    public convenience init(node: Node? = nil, _ child: Tag) {
+        self.init(node: node, [child])
     }
 
     /// initialize a new Tag with children using a builder
-    public convenience init(@TagBuilder _ builder: () -> Tag) {
-        self.init([builder()])
+    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
+        self.init(node: node, [builder()])
     }
     
     /// initialize a new Tag with some contents
-    public convenience init(_ contents: String?) {
-        self.init()
+    public convenience init(node: Node? = nil, _ contents: String?) {
+        self.init(node: node)
         if let contents = contents {
             setContents(contents)
         }
diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index fae87a6..c524106 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -9,19 +9,19 @@
 public enum TagBuilder {
 
     public static func buildBlock() -> Tag {
-        GroupTag()
+        GroupTag {}
     }
     
     public static func buildBlock(_ components: [Tag]...) -> Tag {
-        GroupTag(components.flatMap { $0 })
+        GroupTag { components.flatMap { $0 }}
     }
     
     public static func buildBlock(_ components: Tag...) -> Tag {
-        GroupTag(components)
+        GroupTag { components }
     }
     
     public static func buildOptional(_ component: Tag?) -> Tag {
-        component ?? GroupTag()
+        component ?? GroupTag {}
     }
     
     public static func buildEither(first component: Tag) -> Tag {
@@ -33,48 +33,6 @@ public enum TagBuilder {
     }
     
     public static func buildArray(_ components: [Tag]) -> Tag {
-        GroupTag(components)
+        GroupTag { components }
     }
 }
-
-
-//@resultBuilder
-//public enum TagBuilder {
-//
-//    public static func buildBlock(_ components: [Tag]...) -> [Tag] {
-//        components.flatMap { $0 }
-//    }
-//
-//    public static func buildBlock(_ components: [Tag]...) -> Tag {
-//        let flat = components.flatMap { $0 }
-//        if flat.count < 2, let first = flat.first {
-//            return first
-//        }
-//        return GroupTag(flat)
-//    }
-//
-//    public static func buildExpression(_ expression: [Tag]) -> [Tag] {
-//        expression
-//    }
-//
-//    public static func buildExpression(_ expression: Tag) -> [Tag] {
-//        [expression]
-//    }
-//
-//    public static func buildEither(first component: [Tag]) -> [Tag] {
-//        component
-//    }
-//
-//    public static func buildEither(second component: [Tag]) -> [Tag] {
-//        component
-//    }
-//
-//    public static func buildOptional(_ component: [Tag]?) -> [Tag] {
-//        component ?? []
-//    }
-//
-//    public static func buildArray(_ components: [[Tag]]) -> [Tag] {
-//        components.flatMap { $0 }
-//    }
-//}
-//
diff --git a/Sources/SwiftSitemap/SitemapIndex.swift b/Sources/SwiftSitemap/SitemapIndex.swift
index 40193ef..8102d58 100644
--- a/Sources/SwiftSitemap/SitemapIndex.swift
+++ b/Sources/SwiftSitemap/SitemapIndex.swift
@@ -8,7 +8,7 @@
 open class SitemapIndex: Tag {
 
     public init(@TagBuilder _ builder: () -> Tag) {
-        super.init([builder()])
+        super.init(node: .init(name: Self.name), [builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
         ])
diff --git a/Sources/SwiftSitemap/Url.swift b/Sources/SwiftSitemap/Url.swift
index 903f060..2631b8d 100644
--- a/Sources/SwiftSitemap/Url.swift
+++ b/Sources/SwiftSitemap/Url.swift
@@ -7,4 +7,7 @@
 
 open class Url: Tag {
 
+    convenience init() {
+        self.init(node: .init(name: Self.name))
+    }
 }
diff --git a/Sources/SwiftSitemap/UrlSet.swift b/Sources/SwiftSitemap/UrlSet.swift
index 684e8a3..ed80eaf 100644
--- a/Sources/SwiftSitemap/UrlSet.swift
+++ b/Sources/SwiftSitemap/UrlSet.swift
@@ -8,7 +8,7 @@
 open class UrlSet: Tag {
 
     public init(@TagBuilder _ builder: () -> Tag) {
-        super.init([builder()])
+        super.init(node: .init(name: Self.name), [builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
         ])
diff --git a/Sources/SwiftSvg/Ellipse.swift b/Sources/SwiftSvg/Ellipse.swift
index 0da3ae5..d9851e6 100644
--- a/Sources/SwiftSvg/Ellipse.swift
+++ b/Sources/SwiftSvg/Ellipse.swift
@@ -13,7 +13,7 @@ open class Ellipse: Tag {
                 rx: Double,
                 ry: Double,
                 pathLength: Double? = nil) {
-        super.init()
+        super.init(node: .init(name: Self.name))
         setAttributes([
             .init(key: "cx", value: cx.preciseString),
             .init(key: "cy", value: cy.preciseString),
diff --git a/Sources/SwiftSvg/Rect.swift b/Sources/SwiftSvg/Rect.swift
index adbc5cd..4fed37a 100644
--- a/Sources/SwiftSvg/Rect.swift
+++ b/Sources/SwiftSvg/Rect.swift
@@ -15,7 +15,7 @@ open class Rect: Tag {
                 rx: Double? = nil,
                 ry: Double? = nil,
                 pathLength: Double? = nil) {
-        super.init()
+        super.init(node: .init(name: Self.name))
         setAttributes([
             .init(key: "x", value: x.preciseString),
             .init(key: "y", value: y.preciseString),

From 562f68731da3ef1cdefd6b5dacedf41cc339fa8d Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sat, 8 Jul 2023 21:25:07 -0400
Subject: [PATCH 023/141] Revert TagBuilder

---
 Sources/SwiftHtml/Tags/Area.swift   |  2 +-
 Sources/SwiftHtml/Tags/Base.swift   |  2 +-
 Sources/SwiftHtml/Tags/Br.swift     |  2 +-
 Sources/SwiftHtml/Tags/Col.swift    |  2 +-
 Sources/SwiftHtml/Tags/Embed.swift  |  2 +-
 Sources/SwiftHtml/Tags/Hr.swift     |  2 +-
 Sources/SwiftHtml/Tags/Img.swift    |  2 +-
 Sources/SwiftHtml/Tags/Input.swift  |  2 +-
 Sources/SwiftHtml/Tags/Link.swift   |  2 +-
 Sources/SwiftHtml/Tags/Meta.swift   |  2 +-
 Sources/SwiftHtml/Tags/Param.swift  |  2 +-
 Sources/SwiftHtml/Tags/Source.swift |  2 +-
 Sources/SwiftHtml/Tags/Track.swift  |  2 +-
 Sources/SwiftHtml/Text.swift        |  4 ++--
 Sources/SwiftSgml/EmptyTag.swift    | 20 ++++++++++----------
 Sources/SwiftSgml/GroupTag.swift    | 17 ++++++++---------
 Sources/SwiftSgml/TagBuilder.swift  | 13 +++++++------
 17 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index a57b031..e9261e7 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -52,7 +52,7 @@ open class Area: EmptyTag {
     }
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index 29d1c11..391a923 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -13,7 +13,7 @@
 open class Base: EmptyTag {
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index e35c86b..079b806 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -13,6 +13,6 @@
 open class Br: EmptyTag {
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index 2f679a1..bdd8e1e 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -11,7 +11,7 @@
 open class Col: EmptyTag {
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index ff97654..2719754 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -9,7 +9,7 @@
 open class Embed: EmptyTag {
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index e8ffce8..dd66da4 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -11,6 +11,6 @@
 open class Hr: EmptyTag {
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index b631689..e91b756 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -21,7 +21,7 @@
 open class Img: EmptyTag {
     
     public init(src: String, alt: String) {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
         setAttributes([
             .init(key: "src", value: src),
             .init(key: "alt", value: alt),
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index 3b01e59..8c40b7b 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -13,7 +13,7 @@
 open class Input: EmptyTag {
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index cb7b96a..e289ffd 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -13,7 +13,7 @@
 open class Link: EmptyTag {
     
     public init(rel: Rel) {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
         setAttributes([
             Attribute(key: "rel", value: rel.rawValue),
         ])
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index 61746a2..e889ee5 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -17,7 +17,7 @@
 open class Meta: EmptyTag {
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index 33cdb93..1450bd2 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -9,7 +9,7 @@
 open class Param: EmptyTag {
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index 5cc8ad0..3f52394 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -13,7 +13,7 @@
 open class Source: EmptyTag {
     
     public init() {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index 9a7404a..128e9d6 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -13,7 +13,7 @@
 open class Track: EmptyTag {
     
     public init(src: String) {
-        super.init(name: Self.name)
+        super.init(node: EmptyTag.defaultNode(name: Self.name))
         setAttributes([
             .init(key: "src", value: src)
         ])
diff --git a/Sources/SwiftHtml/Text.swift b/Sources/SwiftHtml/Text.swift
index 50e68bf..1b0bc70 100644
--- a/Sources/SwiftHtml/Text.swift
+++ b/Sources/SwiftHtml/Text.swift
@@ -8,8 +8,8 @@
 /// a plain text node to write simple textual content into the html tree
 open class Text: GroupTag {
     
-    public init(_ contents: String) {
-        super.init(name: Self.name) {}
+    public convenience init(_ contents: String) {
+        self.init(node: GroupTag.defaultNode(name: Self.name))
         setContents(contents)
     }
 }
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index d697f5c..152c131 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -8,14 +8,14 @@
 open class EmptyTag: Tag {
     
     static var type: Node.NodeType { .empty }
-
-    public init(name: String? = nil,
-                contents: String? = nil,
-                attributes: [Attribute] = []) {
-        let node = Node(type: Self.type,
-                        name: name,
-                        contents: contents,
-                        attributes: attributes)
-        super.init(node: node, [])
-    }    
+    
+    public class func defaultNode(name: String,
+                                  contents: String? = nil,
+                                  attributes: [Attribute] = []) -> Node {
+        .init(type: Self.type, name: name, contents: contents, attributes: attributes)
+    }
+    
+    override public init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: node ?? .init(type: Self.type, name: Self.name), children)
+    }
 }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index 651b392..3cfa6dd 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -10,14 +10,13 @@ open class GroupTag: Tag {
     
     static var type: Node.NodeType { .group }
     
-    public init(name: String? = nil,
-                contents: String? = nil,
-                attributes: [Attribute] = [],
-                @TagBuilder _ builder: () -> Tag) {
-        let node = Node(type: Self.type,
-                        name: name,
-                        contents: contents,
-                        attributes: attributes)
-        super.init(node: node, [builder()])
+    public class func defaultNode(name: String,
+                           contents: String? = nil,
+                           attributes: [Attribute] = []) -> Node {
+        .init(type: Self.type, name: name, contents: contents, attributes: attributes)
+    }
+        
+    override public init(node: Node? = nil, _ children: [Tag] = []) {
+        super.init(node: .init(type: Self.type, name: Self.name), children)
     }
 }
diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index c524106..60f7ef7 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -5,23 +5,24 @@
 //  Created by Tibor Bodecs on 2021. 07. 19..
 //
 
+
 @resultBuilder
 public enum TagBuilder {
-
+    
     public static func buildBlock() -> Tag {
-        GroupTag {}
+        GroupTag()
     }
     
     public static func buildBlock(_ components: [Tag]...) -> Tag {
-        GroupTag { components.flatMap { $0 }}
+        GroupTag(components.flatMap { $0 })
     }
     
     public static func buildBlock(_ components: Tag...) -> Tag {
-        GroupTag { components }
+        GroupTag(components)
     }
     
     public static func buildOptional(_ component: Tag?) -> Tag {
-        component ?? GroupTag {}
+        component ?? GroupTag()
     }
     
     public static func buildEither(first component: Tag) -> Tag {
@@ -33,6 +34,6 @@ public enum TagBuilder {
     }
     
     public static func buildArray(_ components: [Tag]) -> Tag {
-        GroupTag { components }
+        GroupTag(components)
     }
 }

From d8727d356be569905c324b1e0c7f2ff5fc0a9015 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sun, 9 Jul 2023 01:29:47 -0400
Subject: [PATCH 024/141] Fixing Tag subclasses

---
 Sources/SwiftHtml/Tags/A.swift                |  6 ++---
 Sources/SwiftHtml/Tags/Abbr.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Address.swift          |  6 ++---
 Sources/SwiftHtml/Tags/Area.swift             |  2 +-
 Sources/SwiftHtml/Tags/Article.swift          |  6 ++---
 Sources/SwiftHtml/Tags/Aside.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Audio.swift            |  6 ++---
 Sources/SwiftHtml/Tags/B.swift                |  6 ++---
 Sources/SwiftHtml/Tags/Base.swift             |  2 +-
 Sources/SwiftHtml/Tags/Bdi.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Bdo.swift              |  4 ++--
 Sources/SwiftHtml/Tags/Blockquote.swift       |  6 ++---
 Sources/SwiftHtml/Tags/Body.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Br.swift               |  2 +-
 Sources/SwiftHtml/Tags/Button.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Canvas.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Caption.swift          |  6 ++---
 Sources/SwiftHtml/Tags/Cite.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Code.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Col.swift              |  2 +-
 Sources/SwiftHtml/Tags/Colgroup.swift         |  6 ++---
 Sources/SwiftHtml/Tags/Comment.swift          |  2 +-
 Sources/SwiftHtml/Tags/Data.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Datalist.swift         |  6 ++---
 Sources/SwiftHtml/Tags/Dd.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Del.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Details.swift          |  6 ++---
 Sources/SwiftHtml/Tags/Dfn.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Dialog.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Div.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Dl.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Dt.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Em.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Embed.swift            |  2 +-
 Sources/SwiftHtml/Tags/Fieldset.swift         |  6 ++---
 Sources/SwiftHtml/Tags/Figcaption.swift       |  6 ++---
 Sources/SwiftHtml/Tags/Figure.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Footer.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Form.swift             |  6 ++---
 Sources/SwiftHtml/Tags/H1.swift               |  6 ++---
 Sources/SwiftHtml/Tags/H2.swift               |  6 ++---
 Sources/SwiftHtml/Tags/H3.swift               |  6 ++---
 Sources/SwiftHtml/Tags/H4.swift               |  6 ++---
 Sources/SwiftHtml/Tags/H5.swift               |  6 ++---
 Sources/SwiftHtml/Tags/H6.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Head.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Header.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Hr.swift               |  2 +-
 Sources/SwiftHtml/Tags/Html.swift             |  6 ++---
 Sources/SwiftHtml/Tags/I.swift                |  6 ++---
 Sources/SwiftHtml/Tags/Iframe.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Img.swift              |  2 +-
 Sources/SwiftHtml/Tags/Input.swift            |  2 +-
 Sources/SwiftHtml/Tags/Ins.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Kbd.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Label.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Legend.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Li.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Link.swift             |  2 +-
 Sources/SwiftHtml/Tags/MainTag.swift          |  6 ++---
 Sources/SwiftHtml/Tags/Map.swift              |  2 +-
 Sources/SwiftHtml/Tags/Mark.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Meta.swift             |  2 +-
 Sources/SwiftHtml/Tags/Meter.swift            |  2 +-
 Sources/SwiftHtml/Tags/Nav.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Noscript.swift         |  6 ++---
 Sources/SwiftHtml/Tags/Object.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Ol.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Optgroup.swift         |  6 ++---
 Sources/SwiftHtml/Tags/Option.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Output.swift           |  6 ++---
 Sources/SwiftHtml/Tags/P.swift                |  6 ++---
 Sources/SwiftHtml/Tags/Param.swift            |  2 +-
 Sources/SwiftHtml/Tags/Picture.swift          |  6 ++---
 Sources/SwiftHtml/Tags/Pre.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Progress.swift         |  6 ++---
 Sources/SwiftHtml/Tags/Q.swift                |  6 ++---
 Sources/SwiftHtml/Tags/Rp.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Rt.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Ruby.swift             |  6 ++---
 Sources/SwiftHtml/Tags/S.swift                |  6 ++---
 Sources/SwiftHtml/Tags/Samp.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Script.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Section.swift          |  6 ++---
 Sources/SwiftHtml/Tags/Select.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Small.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Source.swift           |  2 +-
 Sources/SwiftHtml/Tags/Span.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Strong.swift           |  6 ++---
 Sources/SwiftHtml/Tags/Style.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Sub.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Summary.swift          |  6 ++---
 Sources/SwiftHtml/Tags/Sup.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Table.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Tbody.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Td.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Template.swift         |  6 ++---
 Sources/SwiftHtml/Tags/Textarea.swift         |  6 ++---
 Sources/SwiftHtml/Tags/Tfoot.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Th.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Thead.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Time.swift             |  6 ++---
 Sources/SwiftHtml/Tags/Title.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Tr.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Track.swift            |  2 +-
 Sources/SwiftHtml/Tags/U.swift                |  6 ++---
 Sources/SwiftHtml/Tags/Ul.swift               |  6 ++---
 Sources/SwiftHtml/Tags/Var.swift              |  6 ++---
 Sources/SwiftHtml/Tags/Video.swift            |  6 ++---
 Sources/SwiftHtml/Tags/Wbr.swift              |  6 ++---
 Sources/SwiftHtml/Text.swift                  |  2 +-
 Sources/SwiftRss/Rss.swift                    |  2 +-
 Sources/SwiftSgml/EmptyTag.swift              |  9 ++++---
 Sources/SwiftSgml/GroupTag.swift              |  9 ++++---
 Sources/SwiftSgml/Node.swift                  |  4 ++++
 Sources/SwiftSgml/StandardTag.swift           | 24 +++++++++++++++++++
 Sources/SwiftSgml/Tag.swift                   |  6 +++--
 Sources/SwiftSitemap/SitemapIndex.swift       |  2 +-
 Sources/SwiftSitemap/Url.swift                |  2 +-
 Sources/SwiftSitemap/UrlSet.swift             |  2 +-
 Sources/SwiftSvg/Ellipse.swift                |  2 +-
 Sources/SwiftSvg/Rect.swift                   |  2 +-
 Tests/SwiftHtmlTests/SwiftHtmlTests.swift     |  2 +-
 .../SwiftHtmlTests/Tags/ScriptTagTests.swift  |  4 ++--
 124 files changed, 254 insertions(+), 412 deletions(-)
 create mode 100644 Sources/SwiftSgml/StandardTag.swift

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index d533f82..5360d47 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -14,11 +14,9 @@
 /// - An unvisited link is underlined and blue
 /// - A visited link is underlined and purple
 /// - An active link is underlined and red
-open class A: Tag {
+open class A: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { A.self }
 }
 
 public extension A {
diff --git a/Sources/SwiftHtml/Tags/Abbr.swift b/Sources/SwiftHtml/Tags/Abbr.swift
index 65e4046..3f192a7 100644
--- a/Sources/SwiftHtml/Tags/Abbr.swift
+++ b/Sources/SwiftHtml/Tags/Abbr.swift
@@ -8,10 +8,8 @@
 /// The `<abbr>` tag defines an abbreviation or an acronym, like "HTML", "CSS", "Mr.", "Dr.", "ASAP", "ATM".
 ///
 /// **Tip:** Use the global title attribute to show the description for the abbreviation/acronym when you mouse over the element.
-open class Abbr: Tag {
+open class Abbr: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Abbr.self }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Address.swift b/Sources/SwiftHtml/Tags/Address.swift
index cbb2be9..d9c1c5e 100644
--- a/Sources/SwiftHtml/Tags/Address.swift
+++ b/Sources/SwiftHtml/Tags/Address.swift
@@ -10,9 +10,7 @@
 /// The contact information can be an email address, URL, physical address, phone number, social media handle, etc.
 ///
 /// The text in the `<address>` element usually renders in italic, and browsers will always add a line break before and after the `<address>` element.
-open class Address: Tag {
+open class Address: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Address.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index e9261e7..fef845b 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -52,7 +52,7 @@ open class Area: EmptyTag {
     }
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Area.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index 7f72659..9469624 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -24,10 +24,8 @@ public extension Node {
 ///
 /// **Note:** The `<article>` element does not render as anything special in a browser.
 /// However, you can use CSS to style the `<article>` element (see example below).
-open class Article: Tag {
+open class Article: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Article.self }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Aside.swift b/Sources/SwiftHtml/Tags/Aside.swift
index 107aa93..89bac5d 100644
--- a/Sources/SwiftHtml/Tags/Aside.swift
+++ b/Sources/SwiftHtml/Tags/Aside.swift
@@ -13,10 +13,8 @@
 /// 
 /// **Note:** The `<aside>` element does not render as anything special in a browser.
 /// However, you can use CSS to style the `<aside>` element (see example below).
-open class Aside: Tag {
+open class Aside: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Aside.self }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Audio.swift b/Sources/SwiftHtml/Tags/Audio.swift
index 6931e16..c8a59d7 100644
--- a/Sources/SwiftHtml/Tags/Audio.swift
+++ b/Sources/SwiftHtml/Tags/Audio.swift
@@ -21,11 +21,9 @@
 ///     Safari   | YES | YES  | NO
 ///     Opera    | YES | YES  | YES
 ///      *From Edge 79
-open class Audio: Tag {
+open class Audio: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Audio.self }
 }
 
 public extension Audio {
diff --git a/Sources/SwiftHtml/Tags/B.swift b/Sources/SwiftHtml/Tags/B.swift
index 509063d..236f350 100644
--- a/Sources/SwiftHtml/Tags/B.swift
+++ b/Sources/SwiftHtml/Tags/B.swift
@@ -6,9 +6,7 @@
 //
 
 /// Make some text bold (without marking it as important)
-open class B: Tag {
+open class B: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { B.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index 391a923..0f41150 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -13,7 +13,7 @@
 open class Base: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Base.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Bdi.swift b/Sources/SwiftHtml/Tags/Bdi.swift
index 2dc918b..34e73ed 100644
--- a/Sources/SwiftHtml/Tags/Bdi.swift
+++ b/Sources/SwiftHtml/Tags/Bdi.swift
@@ -10,9 +10,7 @@
 /// The `<bdi>` tag isolates a part of text that might be formatted in a different direction from other text outside it.
 ///
 /// This element is useful when embedding user-generated content with an unknown text direction.
-open class Bdi: Tag {
+open class Bdi: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Bdi.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Bdo.swift b/Sources/SwiftHtml/Tags/Bdo.swift
index 21a30b3..d516190 100644
--- a/Sources/SwiftHtml/Tags/Bdo.swift
+++ b/Sources/SwiftHtml/Tags/Bdo.swift
@@ -11,8 +11,8 @@
 open class Bdo: Tag {
     
     public init(_ contents: String, dir: TextDirection = .ltr) {
-        let node = Node(name: Self.name)
-        super.init(node: node)
+        super.init(node: .init(Bdo.self))
+        self.setContents(contents)
         self.setAttributes([
             .init(key: "dir", value: dir.rawValue)
         ])
diff --git a/Sources/SwiftHtml/Tags/Blockquote.swift b/Sources/SwiftHtml/Tags/Blockquote.swift
index f845afe..77eea6b 100644
--- a/Sources/SwiftHtml/Tags/Blockquote.swift
+++ b/Sources/SwiftHtml/Tags/Blockquote.swift
@@ -8,11 +8,9 @@
 /// The `<blockquote>` tag specifies a section that is quoted from another source.
 /// 
 /// Browsers usually indent `<blockquote>` elements (look at example below to see how to remove the indentation).
-open class Blockquote: Tag {
+open class Blockquote: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Blockquote.self }
 }
 
 public extension Blockquote {
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 40d2a7f..0ccf7c7 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -10,9 +10,7 @@
 /// The `<body>` element contains all the contents of an HTML document, such as headings, paragraphs, images, hyperlinks, tables, lists, etc.
 /// 
 /// **Note:** There can only be one `<body>` element in an HTML document.
-open class Body: Tag {
+open class Body: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Body.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index 079b806..2a7d056 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -13,6 +13,6 @@
 open class Br: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Br.self))
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Button.swift b/Sources/SwiftHtml/Tags/Button.swift
index 56cc00f..acd1ebd 100644
--- a/Sources/SwiftHtml/Tags/Button.swift
+++ b/Sources/SwiftHtml/Tags/Button.swift
@@ -12,11 +12,9 @@
 /// **Tip:** Always specify the type attribute for a `<button>` element, to tell browsers what type of button it is.
 ///
 /// **Tip:** You can easily style buttons with CSS! Look at the examples below or visit our CSS Buttons tutorial.
-open class Button: Tag {
+open class Button: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Button.self }
 }
 
 public extension Button {
diff --git a/Sources/SwiftHtml/Tags/Canvas.swift b/Sources/SwiftHtml/Tags/Canvas.swift
index ec8b451..c5c164e 100644
--- a/Sources/SwiftHtml/Tags/Canvas.swift
+++ b/Sources/SwiftHtml/Tags/Canvas.swift
@@ -10,11 +10,9 @@
 /// The `<canvas>` tag is transparent, and is only a container for graphics, you must use a script to actually draw the graphics.
 /// 
 /// Any text inside the `<canvas>` element will be displayed in browsers with JavaScript disabled and in browsers that do not support <canvas>.
-open class Canvas: Tag {
+open class Canvas: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Canvas.self }
 }
 
 public extension Canvas {
diff --git a/Sources/SwiftHtml/Tags/Caption.swift b/Sources/SwiftHtml/Tags/Caption.swift
index 89b0559..655f70b 100644
--- a/Sources/SwiftHtml/Tags/Caption.swift
+++ b/Sources/SwiftHtml/Tags/Caption.swift
@@ -10,9 +10,7 @@
 /// The `<caption>` tag must be inserted immediately after the `<table>` tag.
 /// 
 /// **Tip:** By default, a table caption will be center-aligned above a table. However, the CSS properties text-align and caption-side can be used to align and place the caption.
-open class Caption: Tag {
+open class Caption: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Caption.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Cite.swift b/Sources/SwiftHtml/Tags/Cite.swift
index 2f6316e..6cb7858 100644
--- a/Sources/SwiftHtml/Tags/Cite.swift
+++ b/Sources/SwiftHtml/Tags/Cite.swift
@@ -10,9 +10,7 @@
 /// **Note:** A person's name is not the title of a work.
 /// 
 /// The text in the `<cite>` element usually renders in italic.
-open class Cite: Tag {
+open class Cite: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Cite.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Code.swift b/Sources/SwiftHtml/Tags/Code.swift
index 81267d3..04940e0 100644
--- a/Sources/SwiftHtml/Tags/Code.swift
+++ b/Sources/SwiftHtml/Tags/Code.swift
@@ -14,9 +14,7 @@
 /// - `<kbd>`    Defines keyboard input
 /// - `<var>`    Defines a variable
 /// - `<pre>`    Defines preformatted text
-open class Code: Tag {
+open class Code: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Code.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index bdd8e1e..e5cc4fb 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -11,7 +11,7 @@
 open class Col: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Col.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Colgroup.swift b/Sources/SwiftHtml/Tags/Colgroup.swift
index 5eca98a..2de0841 100644
--- a/Sources/SwiftHtml/Tags/Colgroup.swift
+++ b/Sources/SwiftHtml/Tags/Colgroup.swift
@@ -12,11 +12,9 @@
 /// **Note:** The `<colgroup>` tag must be a child of a `<table>` element, after any `<caption>` elements and before any `<thead>`, `<tbody>`, `<tfoot>`, and `<tr>` elements.
 ///
 /// **Tip:** To define different properties to a column within a `<colgroup>`, use the `<col>` tag within the `<colgroup>` tag.
-open class Colgroup: Tag {
+open class Colgroup: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Colgroup.self }
 }
 
 public extension Colgroup {
diff --git a/Sources/SwiftHtml/Tags/Comment.swift b/Sources/SwiftHtml/Tags/Comment.swift
index 91bf3b2..25779f0 100644
--- a/Sources/SwiftHtml/Tags/Comment.swift
+++ b/Sources/SwiftHtml/Tags/Comment.swift
@@ -15,7 +15,7 @@
 open class Comment: Tag {
     
     public init(_ contents: String) {
-        super.init(node: .init(name: Self.name))
+        super.init(node: .init(Comment.self))
         setContents(contents)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Data.swift b/Sources/SwiftHtml/Tags/Data.swift
index bfd695b..ad47be7 100644
--- a/Sources/SwiftHtml/Tags/Data.swift
+++ b/Sources/SwiftHtml/Tags/Data.swift
@@ -10,11 +10,9 @@
 /// This element provides both a machine-readable value for data processors, and a human-readable value for rendering in a browser.
 ///
 /// **Tip:** If the content is time- or date-related, use the `<time>` element instead.
-open class Data: Tag {
+open class Data: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Data.self }
 }
 
 public extension Data {
diff --git a/Sources/SwiftHtml/Tags/Datalist.swift b/Sources/SwiftHtml/Tags/Datalist.swift
index a3eebbf..539e7f9 100644
--- a/Sources/SwiftHtml/Tags/Datalist.swift
+++ b/Sources/SwiftHtml/Tags/Datalist.swift
@@ -10,9 +10,7 @@
 /// The `<datalist>` tag is used to provide an "autocomplete" feature for `<input>` elements. Users will see a drop-down list of pre-defined options as they input data.
 ///
 /// The `<datalist>` element's id attribute must be equal to the `<input>` element's list attribute (this binds them together).
-open class Datalist: Tag {
+open class Datalist: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Datalist.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Dd.swift b/Sources/SwiftHtml/Tags/Dd.swift
index acb046a..40b2e27 100644
--- a/Sources/SwiftHtml/Tags/Dd.swift
+++ b/Sources/SwiftHtml/Tags/Dd.swift
@@ -10,9 +10,7 @@
 /// The `<dd>` tag is used in conjunction with `<dl>` (defines a description list) and `<dt>` (defines terms/names).
 /// 
 /// Inside a `<dd>` tag you can put paragraphs, line breaks, images, links, lists, etc.
-open class Dd: Tag {
+open class Dd: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Dd.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Del.swift b/Sources/SwiftHtml/Tags/Del.swift
index 537862a..1ceb469 100644
--- a/Sources/SwiftHtml/Tags/Del.swift
+++ b/Sources/SwiftHtml/Tags/Del.swift
@@ -8,11 +8,9 @@
 /// The `<del>` tag defines text that has been deleted from a document.
 ///
 /// Browsers will usually strike a line through deleted text.
-open class Del: Tag {
+open class Del: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Del.self }
 }
 
 public extension Del {
diff --git a/Sources/SwiftHtml/Tags/Details.swift b/Sources/SwiftHtml/Tags/Details.swift
index a03a1ff..9f92ace 100644
--- a/Sources/SwiftHtml/Tags/Details.swift
+++ b/Sources/SwiftHtml/Tags/Details.swift
@@ -12,11 +12,9 @@
 /// Any sort of content can be put inside the `<details>` tag.
 ///
 /// **Tip:** The `<summary>` tag is used in conjuction with `<details>` to specify a visible heading for the details.
-open class Details: Tag {
+open class Details: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Details.self }
 }
 
 public extension Details {
diff --git a/Sources/SwiftHtml/Tags/Dfn.swift b/Sources/SwiftHtml/Tags/Dfn.swift
index 868f646..19b5ac2 100644
--- a/Sources/SwiftHtml/Tags/Dfn.swift
+++ b/Sources/SwiftHtml/Tags/Dfn.swift
@@ -11,9 +11,7 @@
 ///
 /// The term inside the `<dfn>` tag can be any of the following:
 /// `<p><dfn>HTML</dfn> is the standard markup language for creating web pages.</p>`
-open class Dfn: Tag {
+open class Dfn: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Dfn.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Dialog.swift b/Sources/SwiftHtml/Tags/Dialog.swift
index 975aed5..756ad9d 100644
--- a/Sources/SwiftHtml/Tags/Dialog.swift
+++ b/Sources/SwiftHtml/Tags/Dialog.swift
@@ -8,11 +8,9 @@
 /// The `<dialog>` tag defines a dialog box or subwindow.
 ///
 /// The `<dialog>` element makes it easy to create popup dialogs and modals on a web page.
-open class Dialog: Tag {
+open class Dialog: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Dialog.self }
 }
 
 public extension Dialog {
diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index c2dd207..6ee7ac3 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -14,11 +14,9 @@
 /// Any sort of content can be put inside the `<div>` tag!
 ///
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
-open class Div: Tag {
+open class Div: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Div.self }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Dl.swift b/Sources/SwiftHtml/Tags/Dl.swift
index 6ed4952..f86d0c4 100644
--- a/Sources/SwiftHtml/Tags/Dl.swift
+++ b/Sources/SwiftHtml/Tags/Dl.swift
@@ -8,9 +8,7 @@
 /// The `<dl>` tag defines a description list.
 ///
 /// The `<dl>` tag is used in conjunction with `<dt>` (defines terms/names) and `<dd>` (describes each term/name).
-open class Dl: Tag {
+open class Dl: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Dl.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Dt.swift b/Sources/SwiftHtml/Tags/Dt.swift
index 1847b89..9cba0ed 100644
--- a/Sources/SwiftHtml/Tags/Dt.swift
+++ b/Sources/SwiftHtml/Tags/Dt.swift
@@ -8,9 +8,7 @@
 /// The `<dt>` tag defines a term/name in a description list.
 /// 
 /// The `<dt>` tag is used in conjunction with `<dl>` (defines a description list) and `<dd>` (describes each term/name).
-open class Dt: Tag {
+open class Dt: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Dt.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Em.swift b/Sources/SwiftHtml/Tags/Em.swift
index e2f5fe9..c42190b 100644
--- a/Sources/SwiftHtml/Tags/Em.swift
+++ b/Sources/SwiftHtml/Tags/Em.swift
@@ -8,9 +8,7 @@
 /// The `<em>` tag is used to define emphasized text. The content inside is typically displayed in italic.
 ///
 /// A screen reader will pronounce the words in `<em>` with an emphasis, using verbal stress.
-open class Em: Tag {
+open class Em: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Em.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index 2719754..374908c 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -9,7 +9,7 @@
 open class Embed: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Embed.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Fieldset.swift b/Sources/SwiftHtml/Tags/Fieldset.swift
index 50fdcfd..fdfdab2 100644
--- a/Sources/SwiftHtml/Tags/Fieldset.swift
+++ b/Sources/SwiftHtml/Tags/Fieldset.swift
@@ -8,11 +8,9 @@
 /// The `<fieldset>` tag is used to group related elements in a form.
 /// 
 /// The `<fieldset>` tag draws a box around the related elements.
-open class Fieldset: Tag {
+open class Fieldset: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Fieldset.self }
 }
 
 public extension Fieldset {
diff --git a/Sources/SwiftHtml/Tags/Figcaption.swift b/Sources/SwiftHtml/Tags/Figcaption.swift
index f860bd2..8c5fa4a 100644
--- a/Sources/SwiftHtml/Tags/Figcaption.swift
+++ b/Sources/SwiftHtml/Tags/Figcaption.swift
@@ -8,9 +8,7 @@
 /// The `<figcaption>` tag defines a caption for a `<figure>` element.
 ///
 /// The `<figcaption>` element can be placed as the first or last child of the `<figure>` element.
-open class Figcaption: Tag {
+open class Figcaption: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Figcaption.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Figure.swift b/Sources/SwiftHtml/Tags/Figure.swift
index 12445f4..89c4eb1 100644
--- a/Sources/SwiftHtml/Tags/Figure.swift
+++ b/Sources/SwiftHtml/Tags/Figure.swift
@@ -10,10 +10,8 @@
 /// While the content of the `<figure>` element is related to the main flow, its position is independent of the main flow, and if removed it should not affect the flow of the document.
 ///
 /// **Tip:** The `<figcaption>` element is used to add a caption for the `<figure>` element.
-open class Figure: Tag {
+open class Figure: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Figure.self }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Footer.swift b/Sources/SwiftHtml/Tags/Footer.swift
index 1279d8f..5d4f49c 100644
--- a/Sources/SwiftHtml/Tags/Footer.swift
+++ b/Sources/SwiftHtml/Tags/Footer.swift
@@ -16,9 +16,7 @@
 /// - back to top links
 /// - related documents
 /// You can have several `<footer>` elements in one document.
-open class Footer: Tag {
+open class Footer: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Footer.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Form.swift b/Sources/SwiftHtml/Tags/Form.swift
index 424ff53..1cd1299 100644
--- a/Sources/SwiftHtml/Tags/Form.swift
+++ b/Sources/SwiftHtml/Tags/Form.swift
@@ -18,11 +18,9 @@
 /// - `<fieldset>`
 /// - `<label>`
 /// - `<output>`
-open class Form: Tag {
+open class Form: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Form.self }
 }
 
 public extension Form {
diff --git a/Sources/SwiftHtml/Tags/H1.swift b/Sources/SwiftHtml/Tags/H1.swift
index d924df2..bfdea38 100644
--- a/Sources/SwiftHtml/Tags/H1.swift
+++ b/Sources/SwiftHtml/Tags/H1.swift
@@ -11,9 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H1: Tag {
+open class H1: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { H1.self }
 }
diff --git a/Sources/SwiftHtml/Tags/H2.swift b/Sources/SwiftHtml/Tags/H2.swift
index e496297..b388e95 100644
--- a/Sources/SwiftHtml/Tags/H2.swift
+++ b/Sources/SwiftHtml/Tags/H2.swift
@@ -11,9 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H2: Tag {
+open class H2: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { H2.self }
 }
diff --git a/Sources/SwiftHtml/Tags/H3.swift b/Sources/SwiftHtml/Tags/H3.swift
index e6e9dcc..ab7dadf 100644
--- a/Sources/SwiftHtml/Tags/H3.swift
+++ b/Sources/SwiftHtml/Tags/H3.swift
@@ -11,9 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H3: Tag {
+open class H3: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { H3.self }
 }
diff --git a/Sources/SwiftHtml/Tags/H4.swift b/Sources/SwiftHtml/Tags/H4.swift
index 88c91d0..e10e0bd 100644
--- a/Sources/SwiftHtml/Tags/H4.swift
+++ b/Sources/SwiftHtml/Tags/H4.swift
@@ -11,9 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H4: Tag {
+open class H4: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { H4.self }
 }
diff --git a/Sources/SwiftHtml/Tags/H5.swift b/Sources/SwiftHtml/Tags/H5.swift
index 79ff5ba..64a8c84 100644
--- a/Sources/SwiftHtml/Tags/H5.swift
+++ b/Sources/SwiftHtml/Tags/H5.swift
@@ -11,9 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H5: Tag {
+open class H5: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { H5.self }
 }
diff --git a/Sources/SwiftHtml/Tags/H6.swift b/Sources/SwiftHtml/Tags/H6.swift
index c80a2f9..232b55b 100644
--- a/Sources/SwiftHtml/Tags/H6.swift
+++ b/Sources/SwiftHtml/Tags/H6.swift
@@ -11,9 +11,7 @@
 ///
 /// **Note:** Only use one `<h1>` per page - this should represent the main heading/subject for the whole page.
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
-open class H6: Tag {
+open class H6: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { H6.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index f74c558..0f2007e 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -20,9 +20,7 @@
 /// - `<meta>`
 /// - `<script>`
 /// - `<noscript>`
-open class Head: Tag {
+open class Head: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Head.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Header.swift b/Sources/SwiftHtml/Tags/Header.swift
index 7f3b65b..c36bb8f 100644
--- a/Sources/SwiftHtml/Tags/Header.swift
+++ b/Sources/SwiftHtml/Tags/Header.swift
@@ -13,10 +13,8 @@
 /// - logo or icon
 /// - authorship information
 /// **Note:** You can have several` <header>` elements in one HTML document. However,` <header>` cannot be placed within a` <footer>`,` <address>` or another` <header>` element.
-open class Header: Tag {
+open class Header: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Header.self }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index dd66da4..8fe01a3 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -11,6 +11,6 @@
 open class Hr: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Hr.self))
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index a6ece5e..87ea7ac 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -10,11 +10,9 @@
 /// The `<html>` tag is the container for all other HTML elements (except for the `<!DOCTYPE>` tag).
 ///
 /// **Note:** You should always include the lang attribute inside the `<html>` tag, to declare the language of the Web page. This is meant to assist search engines and browsers.
-open class Html: Tag {
+open class Html: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Html.self }
 }
 
 public extension Html {
diff --git a/Sources/SwiftHtml/Tags/I.swift b/Sources/SwiftHtml/Tags/I.swift
index dfd7e35..48f11da 100644
--- a/Sources/SwiftHtml/Tags/I.swift
+++ b/Sources/SwiftHtml/Tags/I.swift
@@ -16,9 +16,7 @@
 /// - `<mark>` (marked/highlighted text)
 /// - `<cite>` (the title of a work)
 /// - `<dfn>` (a definition term)
-open class I: Tag {
+open class I: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { I.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Iframe.swift b/Sources/SwiftHtml/Tags/Iframe.swift
index ab56f44..b40125f 100644
--- a/Sources/SwiftHtml/Tags/Iframe.swift
+++ b/Sources/SwiftHtml/Tags/Iframe.swift
@@ -12,11 +12,9 @@
 /// **Tip:** Use CSS to style the `<iframe>` (see example below).
 ///
 /// **Tip:** It is a good practice to always include a title attribute for the `<iframe>`. This is used by screen readers to read out what the content of the `<iframe>` is.
-open class Iframe: Tag {
+open class Iframe: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Iframe.self }
 }
 
 public extension Iframe {
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index e91b756..d180e01 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -21,7 +21,7 @@
 open class Img: EmptyTag {
     
     public init(src: String, alt: String) {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Img.self))
         setAttributes([
             .init(key: "src", value: src),
             .init(key: "alt", value: alt),
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index 8c40b7b..a54c38f 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -13,7 +13,7 @@
 open class Input: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Input.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Ins.swift b/Sources/SwiftHtml/Tags/Ins.swift
index 6aad676..25fc056 100644
--- a/Sources/SwiftHtml/Tags/Ins.swift
+++ b/Sources/SwiftHtml/Tags/Ins.swift
@@ -8,9 +8,7 @@
 /// The `<ins>` tag defines a text that has been inserted into a document. Browsers will usually underline inserted text.
 ///
 /// **Tip:** Also look at the `<del>` tag to markup deleted text.
-open class Ins: Tag {
+open class Ins: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Ins.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Kbd.swift b/Sources/SwiftHtml/Tags/Kbd.swift
index 223d335..1a82ab4 100644
--- a/Sources/SwiftHtml/Tags/Kbd.swift
+++ b/Sources/SwiftHtml/Tags/Kbd.swift
@@ -8,9 +8,7 @@
 /// The `<kbd>` tag is used to define keyboard input. The content inside is displayed in the browser's default monospace font.
 ///
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS (see example below).
-open class Kbd: Tag {
+open class Kbd: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Kbd.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Label.swift b/Sources/SwiftHtml/Tags/Label.swift
index 8b8d026..acb7bbd 100644
--- a/Sources/SwiftHtml/Tags/Label.swift
+++ b/Sources/SwiftHtml/Tags/Label.swift
@@ -33,11 +33,9 @@
 ///
 /// Screen reader users (will read out loud the label, when the user is focused on the element)
 /// Users who have difficulty clicking on very small regions (such as checkboxes) - because when a user clicks the text within the `<label>` element, it toggles the input (this increases the hit area).
-open class Label: Tag {
+open class Label: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Label.self }    
 }
 
 public extension Label {
diff --git a/Sources/SwiftHtml/Tags/Legend.swift b/Sources/SwiftHtml/Tags/Legend.swift
index 3c0b9af..78d1d5c 100644
--- a/Sources/SwiftHtml/Tags/Legend.swift
+++ b/Sources/SwiftHtml/Tags/Legend.swift
@@ -6,9 +6,7 @@
 //
 
 /// The `<legend>` tag defines a caption for the `<fieldset>` element.
-open class Legend: Tag {
+open class Legend: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Legend.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Li.swift b/Sources/SwiftHtml/Tags/Li.swift
index 0dd0a0e..d679d50 100644
--- a/Sources/SwiftHtml/Tags/Li.swift
+++ b/Sources/SwiftHtml/Tags/Li.swift
@@ -14,11 +14,9 @@
 /// In `<ol>`, the list items will usually be displayed with numbers or letters.
 ///
 /// **Tip:** Use CSS to style lists.
-open class Li: Tag {
+open class Li: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Li.self }
 }
 
 public extension Li {
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index e289ffd..9724cc5 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -13,7 +13,7 @@
 open class Link: EmptyTag {
     
     public init(rel: Rel) {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Link.self))
         setAttributes([
             Attribute(key: "rel", value: rel.rawValue),
         ])
diff --git a/Sources/SwiftHtml/Tags/MainTag.swift b/Sources/SwiftHtml/Tags/MainTag.swift
index 3d0c950..e8f5a4d 100644
--- a/Sources/SwiftHtml/Tags/MainTag.swift
+++ b/Sources/SwiftHtml/Tags/MainTag.swift
@@ -10,11 +10,9 @@
 /// The content inside the `<main>` element should be unique to the document. It should not contain any content that is repeated across documents such as sidebars, navigation links, copyright information, site logos, and search forms.
 ///
 /// **Note:** There must not be more than one `<main>` element in a document. The `<main>` element must NOT be a descendant of an `<article>`, `<aside>`, `<footer>`, `<header>`, or `<nav>` element.
-open class Main: Tag {
+open class Main: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Main.self }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index d54dfaa..9652f60 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -13,7 +13,7 @@
 open class Map: Tag {
         
     public init(name: String, @TagBuilder _ builder: () -> Tag) {
-        super.init(node: .init(name: Self.name), [builder()])
+        super.init(node: .init(Map.self), [builder()])
         setAttributes([
             .init(key: "name", value: name)
         ])
diff --git a/Sources/SwiftHtml/Tags/Mark.swift b/Sources/SwiftHtml/Tags/Mark.swift
index 013e8f9..ce82637 100644
--- a/Sources/SwiftHtml/Tags/Mark.swift
+++ b/Sources/SwiftHtml/Tags/Mark.swift
@@ -6,9 +6,7 @@
 //
 
 /// The `<mark>` tag defines text that should be marked or highlighted.
-open class Mark: Tag {
+open class Mark: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Mark.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index e889ee5..42a1aff 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -17,7 +17,7 @@
 open class Meta: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Meta.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Meter.swift b/Sources/SwiftHtml/Tags/Meter.swift
index 25ec9a4..c9961b5 100644
--- a/Sources/SwiftHtml/Tags/Meter.swift
+++ b/Sources/SwiftHtml/Tags/Meter.swift
@@ -15,7 +15,7 @@
 open class Meter: Tag {
     
     public init(value: Int, _ contents: String) {
-        super.init(node: .init(name: Self.name))
+        super.init(node: .init(Meter.self))
         setContents(contents)
         setAttributes([
             .init(key: "value", value: String(value))
diff --git a/Sources/SwiftHtml/Tags/Nav.swift b/Sources/SwiftHtml/Tags/Nav.swift
index 8bd9c3c..13d8046 100644
--- a/Sources/SwiftHtml/Tags/Nav.swift
+++ b/Sources/SwiftHtml/Tags/Nav.swift
@@ -10,11 +10,9 @@
 /// Notice that NOT all links of a document should be inside a `<nav>` element. The `<nav>` element is intended only for major block of navigation links.
 /// 
 /// Browsers, such as screen readers for disabled users, can use this element to determine whether to omit the initial rendering of this content.
-open class Nav: Tag {
+open class Nav: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Nav.self }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Noscript.swift b/Sources/SwiftHtml/Tags/Noscript.swift
index 8e19ab3..9c33e53 100644
--- a/Sources/SwiftHtml/Tags/Noscript.swift
+++ b/Sources/SwiftHtml/Tags/Noscript.swift
@@ -8,9 +8,7 @@
 /// The `<noscript>` tag defines an alternate content to be displayed to users that have disabled scripts in their browser or have a browser that doesn't support script.
 /// 
 /// The `<noscript>` element can be used in both `<head>` and `<body>`. When used inside `<head>`, the `<noscript>` element could only contain `<link>`, `<style>`, and `<meta>` elements.
-open class Noscript: Tag {
+open class Noscript: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Noscript.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Object.swift b/Sources/SwiftHtml/Tags/Object.swift
index a1f3353..b6cc341 100644
--- a/Sources/SwiftHtml/Tags/Object.swift
+++ b/Sources/SwiftHtml/Tags/Object.swift
@@ -8,11 +8,9 @@
 /// The `<object>` tag defines a container for an external resource.
 ///
 /// The external resource can be a web page, a picture, a media player, or a plug-in application.
-open class Object: Tag {
+open class Object: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Object.self }
 }
 
 public extension Object {
diff --git a/Sources/SwiftHtml/Tags/Ol.swift b/Sources/SwiftHtml/Tags/Ol.swift
index 4704809..2c37516 100644
--- a/Sources/SwiftHtml/Tags/Ol.swift
+++ b/Sources/SwiftHtml/Tags/Ol.swift
@@ -12,11 +12,9 @@
 /// **Tip:** Use CSS to style lists.
 /// 
 /// **Tip:** For unordered list, use the `<ul>` tag.
-open class Ol: Tag {
+open class Ol: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Ol.self }
 }
 
 public extension Ol {
diff --git a/Sources/SwiftHtml/Tags/Optgroup.swift b/Sources/SwiftHtml/Tags/Optgroup.swift
index 388942f..a43960e 100644
--- a/Sources/SwiftHtml/Tags/Optgroup.swift
+++ b/Sources/SwiftHtml/Tags/Optgroup.swift
@@ -8,11 +8,9 @@
 /// The `<optgroup>` tag is used to group related options in a `<select>` element (drop-down list).
 /// 
 /// If you have a long list of options, groups of related options are easier to handle for a user.
-open class Optgroup: Tag {
+open class Optgroup: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Optgroup.self }
 }
 
 public extension Optgroup {
diff --git a/Sources/SwiftHtml/Tags/Option.swift b/Sources/SwiftHtml/Tags/Option.swift
index dd92302..984094d 100644
--- a/Sources/SwiftHtml/Tags/Option.swift
+++ b/Sources/SwiftHtml/Tags/Option.swift
@@ -12,11 +12,9 @@
 /// **Note:** The `<option>` tag can be used without any attributes, but you usually need the value attribute, which indicates what is sent to the server on form submission.
 /// 
 /// **Tip:** If you have a long list of options, you can group related options within the `<optgroup>` tag.
-open class Option: Tag {
+open class Option: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Option.self }
 }
 
 public extension Option {
diff --git a/Sources/SwiftHtml/Tags/Output.swift b/Sources/SwiftHtml/Tags/Output.swift
index 4906ce1..676efda 100644
--- a/Sources/SwiftHtml/Tags/Output.swift
+++ b/Sources/SwiftHtml/Tags/Output.swift
@@ -6,11 +6,9 @@
 //
 
 /// The `<output>` tag is used to represent the result of a calculation (like one performed by a script).
-open class Output: Tag {
+open class Output: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Output.self }
 }
 
 public extension Output {
diff --git a/Sources/SwiftHtml/Tags/P.swift b/Sources/SwiftHtml/Tags/P.swift
index 01e1355..b3457f6 100644
--- a/Sources/SwiftHtml/Tags/P.swift
+++ b/Sources/SwiftHtml/Tags/P.swift
@@ -10,9 +10,7 @@
 /// Browsers automatically add a single blank line before and after each `<p>` element.
 /// 
 /// **Tip:** Use CSS to style paragraphs.
-open class P: Tag {
+open class P: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { P.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index 1450bd2..011fddb 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -9,7 +9,7 @@
 open class Param: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Param.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Picture.swift b/Sources/SwiftHtml/Tags/Picture.swift
index 41c19ea..0f7ca51 100644
--- a/Sources/SwiftHtml/Tags/Picture.swift
+++ b/Sources/SwiftHtml/Tags/Picture.swift
@@ -16,9 +16,7 @@
 /// The `<img>` element is required as the last child of the `<picture>` element, as a fallback option if none of the source tags matches.
 ///
 /// **Tip:** The `<picture>` element works "similar" to `<video>` and `<audio>`. You set up different sources, and the first source that fits the preferences is the one being used.
-open class Picture: Tag {
+open class Picture: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Picture.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Pre.swift b/Sources/SwiftHtml/Tags/Pre.swift
index 59d081a..1281280 100644
--- a/Sources/SwiftHtml/Tags/Pre.swift
+++ b/Sources/SwiftHtml/Tags/Pre.swift
@@ -9,9 +9,7 @@
 ///
 /// Text in a `<pre>` element is displayed in a fixed-width font, and the text preserves both spaces and line breaks.
 /// The text will be displayed exactly as written in the HTML source code.
-open class Pre: Tag {
+open class Pre: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Pre.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Progress.swift b/Sources/SwiftHtml/Tags/Progress.swift
index 117db3d..cb1b166 100644
--- a/Sources/SwiftHtml/Tags/Progress.swift
+++ b/Sources/SwiftHtml/Tags/Progress.swift
@@ -8,11 +8,9 @@
 /// The `<progress>` tag represents the completion progress of a task.
 /// 
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Progress: Tag {
+open class Progress: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Progress.self }
 }
 
 public extension Progress {
diff --git a/Sources/SwiftHtml/Tags/Q.swift b/Sources/SwiftHtml/Tags/Q.swift
index dbb017d..c12b69d 100644
--- a/Sources/SwiftHtml/Tags/Q.swift
+++ b/Sources/SwiftHtml/Tags/Q.swift
@@ -10,11 +10,9 @@
 /// Browsers normally insert quotation marks around the quotation.
 ///
 /// **Tip:** Use `<blockquote>` for long quotations.
-open class Q: Tag {
+open class Q: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Q.self }
 }
 
 public extension Q {
diff --git a/Sources/SwiftHtml/Tags/Rp.swift b/Sources/SwiftHtml/Tags/Rp.swift
index 2147784..fc40e6c 100644
--- a/Sources/SwiftHtml/Tags/Rp.swift
+++ b/Sources/SwiftHtml/Tags/Rp.swift
@@ -8,9 +8,7 @@
 /// The `<rp>` tag can be used to provide parentheses around a ruby text, to be shown by browsers that do not support ruby annotations.
 ///
 /// Use `<rp>` together with `<ruby>` and `<rt>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
-open class Rp: Tag {
+open class Rp: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Rp.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Rt.swift b/Sources/SwiftHtml/Tags/Rt.swift
index a82f415..4e11d53 100644
--- a/Sources/SwiftHtml/Tags/Rt.swift
+++ b/Sources/SwiftHtml/Tags/Rt.swift
@@ -8,9 +8,7 @@
 /// The `<rt>` tag defines an explanation or pronunciation of characters (for East Asian typography) in a ruby annotation.
 ///
 /// Use `<rt>` together with `<ruby>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
-open class Rt: Tag {
+open class Rt: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Rt.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Ruby.swift b/Sources/SwiftHtml/Tags/Ruby.swift
index 25ed63d..274dd58 100644
--- a/Sources/SwiftHtml/Tags/Ruby.swift
+++ b/Sources/SwiftHtml/Tags/Ruby.swift
@@ -10,9 +10,7 @@
 /// A ruby annotation is a small extra text, attached to the main text to indicate the pronunciation or meaning of the corresponding characters. This kind of annotation is often used in Japanese publications.
 ///
 /// Use `<ruby>` together with `<rt>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that do not support ruby annotations.
-open class Ruby: Tag {
+open class Ruby: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Ruby.self }
 }
diff --git a/Sources/SwiftHtml/Tags/S.swift b/Sources/SwiftHtml/Tags/S.swift
index 83837e5..9215691 100644
--- a/Sources/SwiftHtml/Tags/S.swift
+++ b/Sources/SwiftHtml/Tags/S.swift
@@ -8,9 +8,7 @@
 /// The `<s>` tag specifies text that is no longer correct, accurate or relevant. The text will be displayed with a line through it.
 ///
 /// The `<s>` tag should not be used to define deleted text in a document, use the `<del>` tag for that.
-open class S: Tag {
+open class S: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { S.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Samp.swift b/Sources/SwiftHtml/Tags/Samp.swift
index 405b21a..d64d5dc 100644
--- a/Sources/SwiftHtml/Tags/Samp.swift
+++ b/Sources/SwiftHtml/Tags/Samp.swift
@@ -8,9 +8,7 @@
 /// The `<samp>` tag is used to define sample output from a computer program. The content inside is displayed in the browser's default monospace font.
 ///
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
-open class Samp: Tag {
+open class Samp: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Samp.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Script.swift b/Sources/SwiftHtml/Tags/Script.swift
index e5bef25..8fd8d70 100644
--- a/Sources/SwiftHtml/Tags/Script.swift
+++ b/Sources/SwiftHtml/Tags/Script.swift
@@ -10,11 +10,9 @@
 /// The `<script>` element either contains scripting statements, or it points to an external script file through the src attribute.
 ///
 /// Common uses for JavaScript are image manipulation, form validation, and dynamic changes of content.
-open class Script: Tag {
+open class Script: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Script.self }
     
     public enum `Type`: String {
         case javascript = "text/javascript"
diff --git a/Sources/SwiftHtml/Tags/Section.swift b/Sources/SwiftHtml/Tags/Section.swift
index f4db449..a23d5e0 100644
--- a/Sources/SwiftHtml/Tags/Section.swift
+++ b/Sources/SwiftHtml/Tags/Section.swift
@@ -6,9 +6,7 @@
 //
 
 /// The `<section>` tag defines a section in a document.
-open class Section: Tag {
+open class Section: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Section.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Select.swift b/Sources/SwiftHtml/Tags/Select.swift
index ed90991..d563bb3 100644
--- a/Sources/SwiftHtml/Tags/Select.swift
+++ b/Sources/SwiftHtml/Tags/Select.swift
@@ -16,11 +16,9 @@
 /// The `<option>` tags inside the `<select>` element define the available options in the drop-down list.
 ///
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Select: Tag {
+open class Select: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Select.self }
 }
 
 public extension Select {
diff --git a/Sources/SwiftHtml/Tags/Small.swift b/Sources/SwiftHtml/Tags/Small.swift
index 26d6feb..cd6dfaf 100644
--- a/Sources/SwiftHtml/Tags/Small.swift
+++ b/Sources/SwiftHtml/Tags/Small.swift
@@ -8,9 +8,7 @@
 /// The `<small>` tag defines smaller text (like copyright and other side-comments).
 ///
 /// **Tip:** This tag is not deprecated, but it is possible to achieve richer (or the same) effect with CSS.
-open class Small: Tag {
+open class Small: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Small.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index 3f52394..3dc40e8 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -13,7 +13,7 @@
 open class Source: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Source.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Span.swift b/Sources/SwiftHtml/Tags/Span.swift
index 4dbd3cc..f605c12 100644
--- a/Sources/SwiftHtml/Tags/Span.swift
+++ b/Sources/SwiftHtml/Tags/Span.swift
@@ -10,9 +10,7 @@
 /// The `<span>` tag is easily styled by CSS or manipulated with JavaScript using the class or id attribute.
 ///
 /// The `<span>` tag is much like the `<div>` element, but `<div>` is a block-level element and `<span>` is an inline element.
-open class Span: Tag {
+open class Span: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Span.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Strong.swift b/Sources/SwiftHtml/Tags/Strong.swift
index 49af193..bd962fc 100644
--- a/Sources/SwiftHtml/Tags/Strong.swift
+++ b/Sources/SwiftHtml/Tags/Strong.swift
@@ -8,9 +8,7 @@
 /// The `<strong>` tag is used to define text with strong importance. The content inside is typically displayed in bold.
 ///
 /// **Tip:** Use the `<b>` tag to specify bold text without any extra importance!
-open class Strong: Tag {
+open class Strong: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Strong.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Style.swift b/Sources/SwiftHtml/Tags/Style.swift
index 89efdb3..bfc0667 100644
--- a/Sources/SwiftHtml/Tags/Style.swift
+++ b/Sources/SwiftHtml/Tags/Style.swift
@@ -9,11 +9,9 @@
 /// The `<style>` tag is used to define style information (CSS) for a document.
 ///
 /// Inside the `<style>` element you specify how HTML elements should render in a browser.
-open class Style: Tag {
+open class Style: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Style.self }
 }
 
 public extension Style {
diff --git a/Sources/SwiftHtml/Tags/Sub.swift b/Sources/SwiftHtml/Tags/Sub.swift
index 5b7ca73..72bb407 100644
--- a/Sources/SwiftHtml/Tags/Sub.swift
+++ b/Sources/SwiftHtml/Tags/Sub.swift
@@ -11,9 +11,7 @@
 /// Subscript text can be used for chemical formulas, like H2O.
 ///
 /// **Tip:** Use the `<sup>` tag to define superscripted text.
-open class Sub: Tag {
+open class Sub: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Sub.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Summary.swift b/Sources/SwiftHtml/Tags/Summary.swift
index ad0f97f..6c1dc91 100644
--- a/Sources/SwiftHtml/Tags/Summary.swift
+++ b/Sources/SwiftHtml/Tags/Summary.swift
@@ -8,9 +8,7 @@
 /// The `<summary>` tag defines a visible heading for the `<details>` element. The heading can be clicked to view/hide the details.
 ///
 /// **Note:** The `<summary>` element should be the first child element of the `<details>` element.
-open class Summary: Tag {
+open class Summary: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Summary.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Sup.swift b/Sources/SwiftHtml/Tags/Sup.swift
index a43258d..ca85af3 100644
--- a/Sources/SwiftHtml/Tags/Sup.swift
+++ b/Sources/SwiftHtml/Tags/Sup.swift
@@ -11,9 +11,7 @@
 /// Superscript text can be used for footnotes, like WWW[1].
 ///
 /// **Tip:** Use the `<sub>` tag to define subscript text.
-open class Sup: Tag {
+open class Sup: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Sup.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Table.swift b/Sources/SwiftHtml/Tags/Table.swift
index c4b2f41..2c39787 100644
--- a/Sources/SwiftHtml/Tags/Table.swift
+++ b/Sources/SwiftHtml/Tags/Table.swift
@@ -12,9 +12,7 @@
 /// The `<tr>` element defines a table row, the `<th>` element defines a table header, and the `<td>` element defines a table cell.
 /// 
 /// An HTML table may also include `<caption>`, `<colgroup>`, `<thead>`, `<tfoot>`, and `<tbody>` elements.
-open class Table: Tag {
+open class Table: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Table.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Tbody.swift b/Sources/SwiftHtml/Tags/Tbody.swift
index f5d6460..6574e3c 100644
--- a/Sources/SwiftHtml/Tags/Tbody.swift
+++ b/Sources/SwiftHtml/Tags/Tbody.swift
@@ -17,10 +17,8 @@
 /// The `<tbody>` tag must be used in the following context: As a child of a `<table>` element, after any `<caption>`, `<colgroup>`, and `<thead>` elements.
 ///
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
-open class Tbody: Tag {
+open class Tbody: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Tbody.self }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Td.swift b/Sources/SwiftHtml/Tags/Td.swift
index c0ddde7..68b9935 100644
--- a/Sources/SwiftHtml/Tags/Td.swift
+++ b/Sources/SwiftHtml/Tags/Td.swift
@@ -15,11 +15,9 @@
 /// The text in `<td>` elements are regular and left-aligned by default.
 ///
 /// The text in `<th>` elements are bold and centered by default.
-open class Td: Tag {
+open class Td: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Td.self }
 }
 
 public extension Td {
diff --git a/Sources/SwiftHtml/Tags/Template.swift b/Sources/SwiftHtml/Tags/Template.swift
index 4d34bb0..f3fe1d6 100644
--- a/Sources/SwiftHtml/Tags/Template.swift
+++ b/Sources/SwiftHtml/Tags/Template.swift
@@ -11,11 +11,9 @@
 ///
 /// You can use the `<template>` tag if you have some HTML code you want to use over and over again, but not until you ask for it.
 /// To do this without the `<template>` tag, you have to create the HTML code with JavaScript to prevent the browser from rendering the code.
-open class Template: Tag {
+open class Template: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Template.self }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Textarea.swift b/Sources/SwiftHtml/Tags/Textarea.swift
index da0713f..7b3af4b 100644
--- a/Sources/SwiftHtml/Tags/Textarea.swift
+++ b/Sources/SwiftHtml/Tags/Textarea.swift
@@ -18,11 +18,9 @@
 /// The id attribute is needed to associate the text area with a label.
 ///
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Textarea: Tag {
+open class Textarea: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Textarea.self }
 }
 
 public extension Textarea {
diff --git a/Sources/SwiftHtml/Tags/Tfoot.swift b/Sources/SwiftHtml/Tags/Tfoot.swift
index 13c64fb..1b1d3fe 100644
--- a/Sources/SwiftHtml/Tags/Tfoot.swift
+++ b/Sources/SwiftHtml/Tags/Tfoot.swift
@@ -17,9 +17,7 @@
 /// The `<tfoot>` tag must be used in the following context: As a child of a <table> element, after any `<caption>`, `<colgroup>`, `<thead>`, and `<tbody>` elements.
 ///
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
-open class Tfoot: Tag {
+open class Tfoot: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Tfoot.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Th.swift b/Sources/SwiftHtml/Tags/Th.swift
index 35413fa..d5932ca 100644
--- a/Sources/SwiftHtml/Tags/Th.swift
+++ b/Sources/SwiftHtml/Tags/Th.swift
@@ -15,11 +15,9 @@
 /// The text in `<th>` elements are bold and centered by default.
 ///
 /// The text in `<td>` elements are regular and left-aligned by default.
-open class Th: Tag {
+open class Th: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Th.self }
 }
 
 public extension Th {
diff --git a/Sources/SwiftHtml/Tags/Thead.swift b/Sources/SwiftHtml/Tags/Thead.swift
index 493c1fc..6191c0d 100644
--- a/Sources/SwiftHtml/Tags/Thead.swift
+++ b/Sources/SwiftHtml/Tags/Thead.swift
@@ -17,9 +17,7 @@
 /// The `<thead>` tag must be used in the following context: As a child of a `<table>` element, after any `<caption>` and `<colgroup>` elements, and before any `<tbody>`, `<tfoot>`, and `<tr>` elements.
 ///
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
-open class Thead: Tag {
+open class Thead: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Thead.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Time.swift b/Sources/SwiftHtml/Tags/Time.swift
index 04e27bd..4a532ae 100644
--- a/Sources/SwiftHtml/Tags/Time.swift
+++ b/Sources/SwiftHtml/Tags/Time.swift
@@ -8,11 +8,9 @@
 /// The `<time>` tag defines a specific time (or datetime).
 ///
 /// The datetime attribute of this element is used translate the time into a machine-readable format so that browsers can offer to add date reminders through the user's calendar, and search engines can produce smarter search results.
-open class Time: Tag {
+open class Time: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Time.self }
 }
 
 public extension Time {
diff --git a/Sources/SwiftHtml/Tags/Title.swift b/Sources/SwiftHtml/Tags/Title.swift
index 21c95d9..1932fc7 100644
--- a/Sources/SwiftHtml/Tags/Title.swift
+++ b/Sources/SwiftHtml/Tags/Title.swift
@@ -26,9 +26,7 @@
 /// So, try to make the title as accurate and meaningful as possible!
 ///
 /// **Note:** You can NOT have more than one `<title>` element in an HTML document.
-open class Title: Tag {
+open class Title: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Title.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Tr.swift b/Sources/SwiftHtml/Tags/Tr.swift
index b4f6b76..a9241aa 100644
--- a/Sources/SwiftHtml/Tags/Tr.swift
+++ b/Sources/SwiftHtml/Tags/Tr.swift
@@ -8,9 +8,7 @@
 /// The `<tr>` tag defines a row in an HTML table.
 ///
 /// A `<tr>` element contains one or more `<th>` or `<td>` elements.
-open class Tr: Tag {
+open class Tr: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Tr.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index 128e9d6..e4a3091 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -13,7 +13,7 @@
 open class Track: EmptyTag {
     
     public init(src: String) {
-        super.init(node: EmptyTag.defaultNode(name: Self.name))
+        super.init(node: EmptyTag.defaultNode(Track.self))
         setAttributes([
             .init(key: "src", value: src)
         ])
diff --git a/Sources/SwiftHtml/Tags/U.swift b/Sources/SwiftHtml/Tags/U.swift
index b3ce08e..84ea523 100644
--- a/Sources/SwiftHtml/Tags/U.swift
+++ b/Sources/SwiftHtml/Tags/U.swift
@@ -11,9 +11,7 @@
 /// You can change this with CSS (see example below).
 ///
 /// **Tip:** Avoid using the `<u>` element where it could be confused for a hyperlink!
-open class U: Tag {
+open class U: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { U.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Ul.swift b/Sources/SwiftHtml/Tags/Ul.swift
index 649e8d9..77a6c54 100644
--- a/Sources/SwiftHtml/Tags/Ul.swift
+++ b/Sources/SwiftHtml/Tags/Ul.swift
@@ -12,9 +12,7 @@
 /// **Tip:** Use CSS to style lists.
 /// 
 /// **Tip:** For ordered lists, use the `<ol>` tag.
-open class Ul: Tag {
+open class Ul: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Ul.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Var.swift b/Sources/SwiftHtml/Tags/Var.swift
index e90ed5e..6051626 100644
--- a/Sources/SwiftHtml/Tags/Var.swift
+++ b/Sources/SwiftHtml/Tags/Var.swift
@@ -8,9 +8,7 @@
 /// The `<var>` tag is used to defines a variable in programming or in a mathematical expression. The content inside is typically displayed in italic.
 /// 
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
-open class Var: Tag {
+open class Var: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Var.self }
 }
diff --git a/Sources/SwiftHtml/Tags/Video.swift b/Sources/SwiftHtml/Tags/Video.swift
index 913b86f..d44188b 100644
--- a/Sources/SwiftHtml/Tags/Video.swift
+++ b/Sources/SwiftHtml/Tags/Video.swift
@@ -20,11 +20,9 @@
 ///     Firefox | YES | YES  | YES
 ///     Safari  | YES | YES  | NO
 ///     Opera   | YES | YES  | YES
-open class Video: Tag {
+open class Video: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Video.self }
 }
 
 public extension Video {
diff --git a/Sources/SwiftHtml/Tags/Wbr.swift b/Sources/SwiftHtml/Tags/Wbr.swift
index dd55720..ed34592 100644
--- a/Sources/SwiftHtml/Tags/Wbr.swift
+++ b/Sources/SwiftHtml/Tags/Wbr.swift
@@ -8,9 +8,7 @@
 /// The `<wbr>` (Word Break Opportunity) tag specifies where in a text it would be ok to add a line-break.
 ///
 /// **Tip:** When a word is too long, the browser might break it at the wrong place. You can use the `<wbr>` element to add word break opportunities.
-open class Wbr: Tag {
+open class Wbr: StandardTag {
     
-    public override init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(name: Self.name), children)
-    }
+    override open class var `class`: AnyClass { Wbr.self }
 }
diff --git a/Sources/SwiftHtml/Text.swift b/Sources/SwiftHtml/Text.swift
index 1b0bc70..c84155e 100644
--- a/Sources/SwiftHtml/Text.swift
+++ b/Sources/SwiftHtml/Text.swift
@@ -9,7 +9,7 @@
 open class Text: GroupTag {
     
     public convenience init(_ contents: String) {
-        self.init(node: GroupTag.defaultNode(name: Self.name))
+        self.init(node: GroupTag.defaultNode(Text.self))
         setContents(contents)
     }
 }
diff --git a/Sources/SwiftRss/Rss.swift b/Sources/SwiftRss/Rss.swift
index 413c2f4..b141609 100644
--- a/Sources/SwiftRss/Rss.swift
+++ b/Sources/SwiftRss/Rss.swift
@@ -9,7 +9,7 @@
 open class Rss: Tag {
     
     public init(@TagBuilder _ builder: () -> Tag) {
-        super.init(node: .init(name: Self.name), [builder()])
+        super.init(node: .init(Rss.self), [builder()])
         setAttributes([
             .init(key: "version", value: "2.0"),
 //            .init(key: "xmlns:atom", value: "http://www.w3.org/2005/Atom"),
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index 152c131..f151df7 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -9,13 +9,12 @@ open class EmptyTag: Tag {
     
     static var type: Node.NodeType { .empty }
     
-    public class func defaultNode(name: String,
-                                  contents: String? = nil,
-                                  attributes: [Attribute] = []) -> Node {
-        .init(type: Self.type, name: name, contents: contents, attributes: attributes)
+    public class func defaultNode(_ `class`: AnyClass) -> Node {
+        .init(type: Self.type, name: Self.name(`class`))
     }
     
     override public init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: node ?? .init(type: Self.type, name: Self.name), children)
+        let node = node ?? .init(type: Self.type)
+        super.init(node: node, children)
     }
 }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index 3cfa6dd..2551a48 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -10,13 +10,12 @@ open class GroupTag: Tag {
     
     static var type: Node.NodeType { .group }
     
-    public class func defaultNode(name: String,
-                           contents: String? = nil,
-                           attributes: [Attribute] = []) -> Node {
-        .init(type: Self.type, name: name, contents: contents, attributes: attributes)
+    public class func defaultNode(_ `class`: AnyClass) -> Node {
+        .init(type: Self.type, name: Self.name(`class`))
     }
         
     override public init(node: Node? = nil, _ children: [Tag] = []) {
-        super.init(node: .init(type: Self.type, name: Self.name), children)
+        let node: Node = node ?? .init(type: Self.type)
+        super.init(node: node, children)
     }
 }
diff --git a/Sources/SwiftSgml/Node.swift b/Sources/SwiftSgml/Node.swift
index 00f577e..28d01aa 100644
--- a/Sources/SwiftSgml/Node.swift
+++ b/Sources/SwiftSgml/Node.swift
@@ -35,6 +35,10 @@ public struct Node {
         self.contents = contents
         self.attributes = attributes
     }
+    
+    public init(_ `class`: AnyClass) {
+        self.init(name: String(describing: `class`.self).lowercased())
+    }
 }
 
 public extension Node {
diff --git a/Sources/SwiftSgml/StandardTag.swift b/Sources/SwiftSgml/StandardTag.swift
new file mode 100644
index 0000000..0f751c6
--- /dev/null
+++ b/Sources/SwiftSgml/StandardTag.swift
@@ -0,0 +1,24 @@
+//
+//  File.swift
+//  
+//
+//  Created by Brad Gourley on 7/9/23.
+//
+
+open class StandardTag: Tag {
+    
+    open class var `class`: AnyClass { StandardTag.self }
+    
+    public init(_ children: [Tag] = []) {
+        super.init(node: .init(Self.`class`), children)
+    }
+    
+    public convenience init(@TagBuilder _ builder: () -> Tag) {
+        self.init([builder()])
+    }
+    
+    public convenience init(_ contents: String) {
+        self.init()
+        setContents(contents)
+    }
+}
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 6a42c79..7e5eb72 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -6,12 +6,14 @@
 //
 
 open class Tag {
-    
-    public class var name: String { String(describing: self).lowercased() }
         
     public private(set) var node: Node
     public private(set) var children: [Tag]
     
+    public class func name(_ c: AnyClass) -> String {
+        String(describing: c.self).lowercased()
+    }
+    
     // MARK: - init
         
     /// initialize a new Tag with child tags
diff --git a/Sources/SwiftSitemap/SitemapIndex.swift b/Sources/SwiftSitemap/SitemapIndex.swift
index 8102d58..fa62ad6 100644
--- a/Sources/SwiftSitemap/SitemapIndex.swift
+++ b/Sources/SwiftSitemap/SitemapIndex.swift
@@ -8,7 +8,7 @@
 open class SitemapIndex: Tag {
 
     public init(@TagBuilder _ builder: () -> Tag) {
-        super.init(node: .init(name: Self.name), [builder()])
+        super.init(node: .init(SitemapIndex.self), [builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
         ])
diff --git a/Sources/SwiftSitemap/Url.swift b/Sources/SwiftSitemap/Url.swift
index 2631b8d..ba84ce2 100644
--- a/Sources/SwiftSitemap/Url.swift
+++ b/Sources/SwiftSitemap/Url.swift
@@ -8,6 +8,6 @@
 open class Url: Tag {
 
     convenience init() {
-        self.init(node: .init(name: Self.name))
+        self.init(node: .init(Url.self))
     }
 }
diff --git a/Sources/SwiftSitemap/UrlSet.swift b/Sources/SwiftSitemap/UrlSet.swift
index ed80eaf..ee76fa5 100644
--- a/Sources/SwiftSitemap/UrlSet.swift
+++ b/Sources/SwiftSitemap/UrlSet.swift
@@ -8,7 +8,7 @@
 open class UrlSet: Tag {
 
     public init(@TagBuilder _ builder: () -> Tag) {
-        super.init(node: .init(name: Self.name), [builder()])
+        super.init(node: .init(UrlSet.self), [builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
         ])
diff --git a/Sources/SwiftSvg/Ellipse.swift b/Sources/SwiftSvg/Ellipse.swift
index d9851e6..03a47b7 100644
--- a/Sources/SwiftSvg/Ellipse.swift
+++ b/Sources/SwiftSvg/Ellipse.swift
@@ -13,7 +13,7 @@ open class Ellipse: Tag {
                 rx: Double,
                 ry: Double,
                 pathLength: Double? = nil) {
-        super.init(node: .init(name: Self.name))
+        super.init(node: .init(Ellipse.self))
         setAttributes([
             .init(key: "cx", value: cx.preciseString),
             .init(key: "cy", value: cy.preciseString),
diff --git a/Sources/SwiftSvg/Rect.swift b/Sources/SwiftSvg/Rect.swift
index 4fed37a..54ed308 100644
--- a/Sources/SwiftSvg/Rect.swift
+++ b/Sources/SwiftSvg/Rect.swift
@@ -15,7 +15,7 @@ open class Rect: Tag {
                 rx: Double? = nil,
                 ry: Double? = nil,
                 pathLength: Double? = nil) {
-        super.init(node: .init(name: Self.name))
+        super.init(node: .init(Rect.self))
         setAttributes([
             .init(key: "x", value: x.preciseString),
             .init(key: "y", value: y.preciseString),
diff --git a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
index 56616ff..481f9b0 100644
--- a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
+++ b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
@@ -11,7 +11,7 @@ import XCTest
 extension Div {
 
     convenience init(_ value: String, @TagBuilder _ builder: () -> Tag) {
-        self.init(builder())
+        self.init(builder)
         self.setAttributes([
             .init(key: "some-key", value: value)
         ])
diff --git a/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift b/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift
index 3ff24da..93e5dc1 100644
--- a/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift
+++ b/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift
@@ -12,7 +12,7 @@ final class ScriptTagTests: XCTestCase {
 
     func testScript() {
         let doc = Document(.html) {
-            Script()
+            Script {}
                 .src("./js/main.js")
                 .async()
         }
@@ -25,7 +25,7 @@ final class ScriptTagTests: XCTestCase {
     
     func testIntegrity() {
         let doc = Document {
-            Script()
+            Script {}
                 .src("https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js")
                 .integrity("sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl")
                 .crossorigin(.anonymous)

From 6b5eecf71d1f751ad66036cda5bff415aa3caea3 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sun, 9 Jul 2023 01:39:27 -0400
Subject: [PATCH 025/141] More fixes

---
 Sources/SwiftSgml/EmptyTag.swift | 5 +++++
 Sources/SwiftSgml/GroupTag.swift | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index f151df7..4c6c098 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -17,4 +17,9 @@ open class EmptyTag: Tag {
         let node = node ?? .init(type: Self.type)
         super.init(node: node, children)
     }
+    
+    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
+        let node: Node = node ?? .init(type: Self.type)
+        self.init(node: node, [builder()])
+    }
 }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index 2551a48..1513832 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -18,4 +18,9 @@ open class GroupTag: Tag {
         let node: Node = node ?? .init(type: Self.type)
         super.init(node: node, children)
     }
+    
+    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
+        let node: Node = node ?? .init(type: Self.type)
+        self.init(node: node, [builder()])
+    }
 }

From 7041b5c76a0243e128f1b1c5419483969a82aa25 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sun, 9 Jul 2023 07:33:29 -0400
Subject: [PATCH 026/141] More refinements

---
 Sources/SwiftHtml/Tags/Area.swift   |  2 +-
 Sources/SwiftHtml/Tags/Base.swift   |  2 +-
 Sources/SwiftHtml/Tags/Br.swift     |  2 +-
 Sources/SwiftHtml/Tags/Col.swift    |  2 +-
 Sources/SwiftHtml/Tags/Embed.swift  |  2 +-
 Sources/SwiftHtml/Tags/Hr.swift     |  2 +-
 Sources/SwiftHtml/Tags/Img.swift    |  2 +-
 Sources/SwiftHtml/Tags/Input.swift  |  2 +-
 Sources/SwiftHtml/Tags/Link.swift   |  2 +-
 Sources/SwiftHtml/Tags/Meta.swift   |  2 +-
 Sources/SwiftHtml/Tags/Param.swift  |  2 +-
 Sources/SwiftHtml/Tags/Source.swift |  2 +-
 Sources/SwiftHtml/Tags/Track.swift  |  2 +-
 Sources/SwiftHtml/Text.swift        |  8 +-------
 Sources/SwiftSgml/EmptyTag.swift    | 31 ++++++++++++++++++++---------
 Sources/SwiftSgml/GroupTag.swift    | 23 +++++++++++----------
 Sources/SwiftSgml/Tag.swift         |  4 ----
 17 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index fef845b..454f888 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -52,7 +52,7 @@ open class Area: EmptyTag {
     }
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Area.self))
+        super.init(name: .init(Area.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index 0f41150..918d7fc 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -13,7 +13,7 @@
 open class Base: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Base.self))
+        super.init(name: .init(Base.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index 2a7d056..4c96f1b 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -13,6 +13,6 @@
 open class Br: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Br.self))
+        super.init(name: .init(Br.self))
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index e5cc4fb..2790999 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -11,7 +11,7 @@
 open class Col: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Col.self))
+        super.init(name: .init(Col.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index 374908c..e545392 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -9,7 +9,7 @@
 open class Embed: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Embed.self))
+        super.init(name: .init(Embed.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index 8fe01a3..cabe2c1 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -11,6 +11,6 @@
 open class Hr: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Hr.self))
+        super.init(name: .init(Hr.self))
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index d180e01..630ae58 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -21,7 +21,7 @@
 open class Img: EmptyTag {
     
     public init(src: String, alt: String) {
-        super.init(node: EmptyTag.defaultNode(Img.self))
+        super.init(name: .init(Img.self))
         setAttributes([
             .init(key: "src", value: src),
             .init(key: "alt", value: alt),
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index a54c38f..27d1d04 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -13,7 +13,7 @@
 open class Input: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Input.self))
+        super.init(name: .init(Input.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index 9724cc5..82012e3 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -13,7 +13,7 @@
 open class Link: EmptyTag {
     
     public init(rel: Rel) {
-        super.init(node: EmptyTag.defaultNode(Link.self))
+        super.init(name: .init(Link.self))
         setAttributes([
             Attribute(key: "rel", value: rel.rawValue),
         ])
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index 42a1aff..dc4b4be 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -17,7 +17,7 @@
 open class Meta: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Meta.self))
+        super.init(name: .init(Meta.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index 011fddb..cac6454 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -9,7 +9,7 @@
 open class Param: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Param.self))
+        super.init(name: .init(Param.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index 3dc40e8..bd623bf 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -13,7 +13,7 @@
 open class Source: EmptyTag {
     
     public init() {
-        super.init(node: EmptyTag.defaultNode(Source.self))
+        super.init(name: .init(Source.self))
     }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index e4a3091..1ce6553 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -13,7 +13,7 @@
 open class Track: EmptyTag {
     
     public init(src: String) {
-        super.init(node: EmptyTag.defaultNode(Track.self))
+        super.init(name: .init(Track.self))
         setAttributes([
             .init(key: "src", value: src)
         ])
diff --git a/Sources/SwiftHtml/Text.swift b/Sources/SwiftHtml/Text.swift
index c84155e..92322ad 100644
--- a/Sources/SwiftHtml/Text.swift
+++ b/Sources/SwiftHtml/Text.swift
@@ -6,10 +6,4 @@
 //
 
 /// a plain text node to write simple textual content into the html tree
-open class Text: GroupTag {
-    
-    public convenience init(_ contents: String) {
-        self.init(node: GroupTag.defaultNode(Text.self))
-        setContents(contents)
-    }
-}
+open class Text: GroupTag {}
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index 4c6c098..d8ad053 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -7,19 +7,32 @@
 
 open class EmptyTag: Tag {
     
-    static var type: Node.NodeType { .empty }
+    open class func node(_ name: String) -> Node {
+        .init(type: .empty, name: name)
+    }
+    
+    public init(name: String, _ children: [Tag] = []) {
+        super.init(node: Self.node(name), children)
+    }
     
-    public class func defaultNode(_ `class`: AnyClass) -> Node {
-        .init(type: Self.type, name: Self.name(`class`))
+    public init(name: String, @TagBuilder _ builder: () -> Tag) {
+        super.init(node:Self.node(name), [builder()])
     }
     
-    override public init(node: Node? = nil, _ children: [Tag] = []) {
-        let node = node ?? .init(type: Self.type)
-        super.init(node: node, children)
+    public convenience init(name: String, _ child: Tag) {
+        self.init(name: name, [child])
     }
     
-    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
-        let node: Node = node ?? .init(type: Self.type)
-        self.init(node: node, [builder()])
+    public convenience init(name: String, _ contents: String?) {
+        self.init(name: name)
+        setContents(contents)
+    }
+}
+
+extension String {
+    
+    public init(_ `class`: AnyClass) {
+        self.init(describing: `class`.self)
+        _ = lowercased()
     }
 }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index 1513832..87c259b 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -8,19 +8,22 @@
 
 open class GroupTag: Tag {
     
-    static var type: Node.NodeType { .group }
+    static var node: Node { .init(type: .group) }
+
+    public init(_ children: [Tag] = []) {
+        super.init(node: Self.node, children)
+    }
     
-    public class func defaultNode(_ `class`: AnyClass) -> Node {
-        .init(type: Self.type, name: Self.name(`class`))
+    public init(@TagBuilder _ builder: () -> Tag) {
+        super.init(node: Self.node, [builder()])
     }
-        
-    override public init(node: Node? = nil, _ children: [Tag] = []) {
-        let node: Node = node ?? .init(type: Self.type)
-        super.init(node: node, children)
+    
+    public convenience init(_ child: Tag) {
+        self.init([child])
     }
     
-    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
-        let node: Node = node ?? .init(type: Self.type)
-        self.init(node: node, [builder()])
+    public convenience init(_ contents: String?) {
+        self.init()
+        setContents(contents)
     }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 7e5eb72..13a36aa 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -10,10 +10,6 @@ open class Tag {
     public private(set) var node: Node
     public private(set) var children: [Tag]
     
-    public class func name(_ c: AnyClass) -> String {
-        String(describing: c.self).lowercased()
-    }
-    
     // MARK: - init
         
     /// initialize a new Tag with child tags

From f90bcc1f258a6ecc09d42d6a8801333c5b98ba34 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 10 Jul 2023 07:09:14 -0400
Subject: [PATCH 027/141] Subclassing while maintaining root tag name

---
 Sources/SwiftHtml/Tags/A.swift          |  2 +-
 Sources/SwiftHtml/Tags/Abbr.swift       |  2 +-
 Sources/SwiftHtml/Tags/Address.swift    |  2 +-
 Sources/SwiftHtml/Tags/Area.swift       |  4 +-
 Sources/SwiftHtml/Tags/Article.swift    |  2 +-
 Sources/SwiftHtml/Tags/Aside.swift      |  2 +-
 Sources/SwiftHtml/Tags/Audio.swift      |  2 +-
 Sources/SwiftHtml/Tags/B.swift          |  2 +-
 Sources/SwiftHtml/Tags/Base.swift       |  4 +-
 Sources/SwiftHtml/Tags/Bdi.swift        |  2 +-
 Sources/SwiftHtml/Tags/Bdo.swift        |  6 ++-
 Sources/SwiftHtml/Tags/Blockquote.swift |  2 +-
 Sources/SwiftHtml/Tags/Body.swift       |  2 +-
 Sources/SwiftHtml/Tags/Br.swift         |  4 +-
 Sources/SwiftHtml/Tags/Button.swift     |  2 +-
 Sources/SwiftHtml/Tags/Canvas.swift     |  2 +-
 Sources/SwiftHtml/Tags/Caption.swift    |  2 +-
 Sources/SwiftHtml/Tags/Cite.swift       |  2 +-
 Sources/SwiftHtml/Tags/Code.swift       |  2 +-
 Sources/SwiftHtml/Tags/Col.swift        |  4 +-
 Sources/SwiftHtml/Tags/Colgroup.swift   |  2 +-
 Sources/SwiftHtml/Tags/Comment.swift    |  8 +++-
 Sources/SwiftHtml/Tags/Data.swift       |  2 +-
 Sources/SwiftHtml/Tags/Datalist.swift   |  2 +-
 Sources/SwiftHtml/Tags/Dd.swift         |  2 +-
 Sources/SwiftHtml/Tags/Del.swift        |  2 +-
 Sources/SwiftHtml/Tags/Details.swift    |  2 +-
 Sources/SwiftHtml/Tags/Dfn.swift        |  2 +-
 Sources/SwiftHtml/Tags/Dialog.swift     |  2 +-
 Sources/SwiftHtml/Tags/Div.swift        |  2 +-
 Sources/SwiftHtml/Tags/Dl.swift         |  2 +-
 Sources/SwiftHtml/Tags/Dt.swift         |  2 +-
 Sources/SwiftHtml/Tags/Em.swift         |  2 +-
 Sources/SwiftHtml/Tags/Embed.swift      |  5 +--
 Sources/SwiftHtml/Tags/Fieldset.swift   |  2 +-
 Sources/SwiftHtml/Tags/Figcaption.swift |  2 +-
 Sources/SwiftHtml/Tags/Figure.swift     |  2 +-
 Sources/SwiftHtml/Tags/Footer.swift     |  2 +-
 Sources/SwiftHtml/Tags/Form.swift       |  2 +-
 Sources/SwiftHtml/Tags/H1.swift         |  2 +-
 Sources/SwiftHtml/Tags/H2.swift         |  2 +-
 Sources/SwiftHtml/Tags/H3.swift         |  2 +-
 Sources/SwiftHtml/Tags/H4.swift         |  2 +-
 Sources/SwiftHtml/Tags/H5.swift         |  2 +-
 Sources/SwiftHtml/Tags/H6.swift         |  2 +-
 Sources/SwiftHtml/Tags/Head.swift       |  2 +-
 Sources/SwiftHtml/Tags/Header.swift     |  2 +-
 Sources/SwiftHtml/Tags/Hr.swift         |  4 +-
 Sources/SwiftHtml/Tags/Html.swift       |  2 +-
 Sources/SwiftHtml/Tags/I.swift          |  2 +-
 Sources/SwiftHtml/Tags/Iframe.swift     |  2 +-
 Sources/SwiftHtml/Tags/Img.swift        |  4 +-
 Sources/SwiftHtml/Tags/Input.swift      |  4 +-
 Sources/SwiftHtml/Tags/Ins.swift        |  2 +-
 Sources/SwiftHtml/Tags/Kbd.swift        |  2 +-
 Sources/SwiftHtml/Tags/Label.swift      |  2 +-
 Sources/SwiftHtml/Tags/Legend.swift     |  2 +-
 Sources/SwiftHtml/Tags/Li.swift         |  2 +-
 Sources/SwiftHtml/Tags/Link.swift       |  4 +-
 Sources/SwiftHtml/Tags/MainTag.swift    |  2 +-
 Sources/SwiftHtml/Tags/Map.swift        |  6 ++-
 Sources/SwiftHtml/Tags/Mark.swift       |  2 +-
 Sources/SwiftHtml/Tags/Meta.swift       |  4 +-
 Sources/SwiftHtml/Tags/Meter.swift      |  6 ++-
 Sources/SwiftHtml/Tags/Nav.swift        |  2 +-
 Sources/SwiftHtml/Tags/Noscript.swift   |  2 +-
 Sources/SwiftHtml/Tags/Object.swift     |  2 +-
 Sources/SwiftHtml/Tags/Ol.swift         |  2 +-
 Sources/SwiftHtml/Tags/Optgroup.swift   |  2 +-
 Sources/SwiftHtml/Tags/Option.swift     |  2 +-
 Sources/SwiftHtml/Tags/Output.swift     |  2 +-
 Sources/SwiftHtml/Tags/P.swift          |  2 +-
 Sources/SwiftHtml/Tags/Param.swift      |  4 +-
 Sources/SwiftHtml/Tags/Picture.swift    |  2 +-
 Sources/SwiftHtml/Tags/Pre.swift        |  2 +-
 Sources/SwiftHtml/Tags/Progress.swift   |  2 +-
 Sources/SwiftHtml/Tags/Q.swift          |  2 +-
 Sources/SwiftHtml/Tags/Rp.swift         |  2 +-
 Sources/SwiftHtml/Tags/Rt.swift         |  2 +-
 Sources/SwiftHtml/Tags/Ruby.swift       |  2 +-
 Sources/SwiftHtml/Tags/S.swift          |  2 +-
 Sources/SwiftHtml/Tags/Samp.swift       |  2 +-
 Sources/SwiftHtml/Tags/Script.swift     |  2 +-
 Sources/SwiftHtml/Tags/Section.swift    |  2 +-
 Sources/SwiftHtml/Tags/Select.swift     |  2 +-
 Sources/SwiftHtml/Tags/Small.swift      |  2 +-
 Sources/SwiftHtml/Tags/Source.swift     |  4 +-
 Sources/SwiftHtml/Tags/Span.swift       |  2 +-
 Sources/SwiftHtml/Tags/Strong.swift     |  2 +-
 Sources/SwiftHtml/Tags/Style.swift      |  2 +-
 Sources/SwiftHtml/Tags/Sub.swift        |  2 +-
 Sources/SwiftHtml/Tags/Summary.swift    |  2 +-
 Sources/SwiftHtml/Tags/Sup.swift        |  2 +-
 Sources/SwiftHtml/Tags/Table.swift      |  2 +-
 Sources/SwiftHtml/Tags/Tbody.swift      |  2 +-
 Sources/SwiftHtml/Tags/Td.swift         |  2 +-
 Sources/SwiftHtml/Tags/Template.swift   |  2 +-
 Sources/SwiftHtml/Tags/Textarea.swift   |  2 +-
 Sources/SwiftHtml/Tags/Tfoot.swift      |  2 +-
 Sources/SwiftHtml/Tags/Th.swift         |  2 +-
 Sources/SwiftHtml/Tags/Thead.swift      |  2 +-
 Sources/SwiftHtml/Tags/Time.swift       |  2 +-
 Sources/SwiftHtml/Tags/Title.swift      |  2 +-
 Sources/SwiftHtml/Tags/Tr.swift         |  2 +-
 Sources/SwiftHtml/Tags/Track.swift      |  4 +-
 Sources/SwiftHtml/Tags/U.swift          |  2 +-
 Sources/SwiftHtml/Tags/Ul.swift         |  2 +-
 Sources/SwiftHtml/Tags/Var.swift        |  2 +-
 Sources/SwiftHtml/Tags/Video.swift      |  2 +-
 Sources/SwiftHtml/Tags/Wbr.swift        |  2 +-
 Sources/SwiftRss/Channel.swift          |  3 +-
 Sources/SwiftRss/Description.swift      |  4 +-
 Sources/SwiftRss/Guid.swift             |  4 +-
 Sources/SwiftRss/Item.swift             |  4 +-
 Sources/SwiftRss/Language.swift         |  3 +-
 Sources/SwiftRss/LastBuildDate.swift    |  5 ++-
 Sources/SwiftRss/Link.swift             |  3 +-
 Sources/SwiftRss/PubDate.swift          |  5 ++-
 Sources/SwiftRss/Rss.swift              |  6 ++-
 Sources/SwiftRss/Title.swift            |  4 +-
 Sources/SwiftRss/Ttl.swift              |  4 +-
 Sources/SwiftSgml/Attribute.swift       |  2 +-
 Sources/SwiftSgml/EmptyTag.swift        | 31 +-------------
 Sources/SwiftSgml/GroupTag.swift        | 24 ++---------
 Sources/SwiftSgml/Node.swift            |  4 --
 Sources/SwiftSgml/StandardTag.swift     | 19 ++-------
 Sources/SwiftSgml/TypedTag.swift        | 56 +++++++++++++++++++++++++
 Sources/SwiftSitemap/ChangeFreq.swift   |  4 +-
 Sources/SwiftSitemap/LastMod.swift      |  4 +-
 Sources/SwiftSitemap/Loc.swift          |  3 +-
 Sources/SwiftSitemap/Priority.swift     |  4 +-
 Sources/SwiftSitemap/Sitemap.swift      |  5 ++-
 Sources/SwiftSitemap/SitemapIndex.swift |  6 ++-
 Sources/SwiftSitemap/Url.swift          |  8 ++--
 Sources/SwiftSitemap/UrlSet.swift       |  6 ++-
 Sources/SwiftSvg/Circle.swift           |  4 +-
 Sources/SwiftSvg/Ellipse.swift          |  6 ++-
 Sources/SwiftSvg/Line.swift             |  4 +-
 Sources/SwiftSvg/Path.swift             |  4 +-
 Sources/SwiftSvg/Polygon.swift          |  4 +-
 Sources/SwiftSvg/Polyline.swift         |  4 +-
 Sources/SwiftSvg/Rect.swift             |  6 ++-
 Sources/SwiftSvg/Svg.swift              |  5 ++-
 Tests/SwiftRssTests/SwiftRssTests.swift |  6 +--
 Tests/SwiftSgmlTests/CustomTags.swift   |  6 +--
 Tests/SwiftSitemapTests/assert.swift    |  1 +
 146 files changed, 284 insertions(+), 252 deletions(-)
 create mode 100644 Sources/SwiftSgml/TypedTag.swift

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index 5360d47..d15e091 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -16,7 +16,7 @@
 /// - An active link is underlined and red
 open class A: StandardTag {
     
-    override open class var `class`: AnyClass { A.self }
+    override open class var name: String { .init(A.self) }
 }
 
 public extension A {
diff --git a/Sources/SwiftHtml/Tags/Abbr.swift b/Sources/SwiftHtml/Tags/Abbr.swift
index 3f192a7..62346b9 100644
--- a/Sources/SwiftHtml/Tags/Abbr.swift
+++ b/Sources/SwiftHtml/Tags/Abbr.swift
@@ -10,6 +10,6 @@
 /// **Tip:** Use the global title attribute to show the description for the abbreviation/acronym when you mouse over the element.
 open class Abbr: StandardTag {
     
-    override open class var `class`: AnyClass { Abbr.self }
+    override open class var name: String { .init(Abbr.self) }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Address.swift b/Sources/SwiftHtml/Tags/Address.swift
index d9c1c5e..c80ed74 100644
--- a/Sources/SwiftHtml/Tags/Address.swift
+++ b/Sources/SwiftHtml/Tags/Address.swift
@@ -12,5 +12,5 @@
 /// The text in the `<address>` element usually renders in italic, and browsers will always add a line break before and after the `<address>` element.
 open class Address: StandardTag {
     
-    override open class var `class`: AnyClass { Address.self }
+    override open class var name: String { .init(Address.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index 454f888..f76c58c 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -51,9 +51,7 @@ open class Area: EmptyTag {
         case poly
     }
     
-    public init() {
-        super.init(name: .init(Area.self))
-    }
+    override open class var name: String { .init(Area.self) }    
 }
 
 public extension Area {
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index 9469624..b45b09c 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -26,6 +26,6 @@ public extension Node {
 /// However, you can use CSS to style the `<article>` element (see example below).
 open class Article: StandardTag {
     
-    override open class var `class`: AnyClass { Article.self }
+    override open class var name: String { .init(Article.self) }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Aside.swift b/Sources/SwiftHtml/Tags/Aside.swift
index 89bac5d..8e892c4 100644
--- a/Sources/SwiftHtml/Tags/Aside.swift
+++ b/Sources/SwiftHtml/Tags/Aside.swift
@@ -15,6 +15,6 @@
 /// However, you can use CSS to style the `<aside>` element (see example below).
 open class Aside: StandardTag {
     
-    override open class var `class`: AnyClass { Aside.self }
+    override open class var name: String { .init(Aside.self) }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Audio.swift b/Sources/SwiftHtml/Tags/Audio.swift
index c8a59d7..45cf4a4 100644
--- a/Sources/SwiftHtml/Tags/Audio.swift
+++ b/Sources/SwiftHtml/Tags/Audio.swift
@@ -23,7 +23,7 @@
 ///      *From Edge 79
 open class Audio: StandardTag {
     
-    override open class var `class`: AnyClass { Audio.self }
+    override open class var name: String { .init(Audio.self) }
 }
 
 public extension Audio {
diff --git a/Sources/SwiftHtml/Tags/B.swift b/Sources/SwiftHtml/Tags/B.swift
index 236f350..3bed16f 100644
--- a/Sources/SwiftHtml/Tags/B.swift
+++ b/Sources/SwiftHtml/Tags/B.swift
@@ -8,5 +8,5 @@
 /// Make some text bold (without marking it as important)
 open class B: StandardTag {
     
-    override open class var `class`: AnyClass { B.self }
+    override open class var name: String { .init(B.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index 918d7fc..d7515f6 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -12,9 +12,7 @@
 /// There can only be one single `<base>` element in a document, and it must be inside the `<head>` element.
 open class Base: EmptyTag {
     
-    public init() {
-        super.init(name: .init(Base.self))
-    }
+    override open class var name: String { .init(Base.self) }
 }
 
 public extension Base {
diff --git a/Sources/SwiftHtml/Tags/Bdi.swift b/Sources/SwiftHtml/Tags/Bdi.swift
index 34e73ed..6a3d7d7 100644
--- a/Sources/SwiftHtml/Tags/Bdi.swift
+++ b/Sources/SwiftHtml/Tags/Bdi.swift
@@ -12,5 +12,5 @@
 /// This element is useful when embedding user-generated content with an unknown text direction.
 open class Bdi: StandardTag {
     
-    override open class var `class`: AnyClass { Bdi.self }
+    override open class var name: String { .init(Bdi.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Bdo.swift b/Sources/SwiftHtml/Tags/Bdo.swift
index d516190..5e96567 100644
--- a/Sources/SwiftHtml/Tags/Bdo.swift
+++ b/Sources/SwiftHtml/Tags/Bdo.swift
@@ -8,10 +8,12 @@
 /// BDO stands for Bi-Directional Override.
 ///
 /// The `<bdo>` tag is used to override the current text direction.
-open class Bdo: Tag {
+open class Bdo: StandardTag {
+    
+    override open class var name: String { .init(Bdo.self) }
     
     public init(_ contents: String, dir: TextDirection = .ltr) {
-        super.init(node: .init(Bdo.self))
+        super.init()
         self.setContents(contents)
         self.setAttributes([
             .init(key: "dir", value: dir.rawValue)
diff --git a/Sources/SwiftHtml/Tags/Blockquote.swift b/Sources/SwiftHtml/Tags/Blockquote.swift
index 77eea6b..fccd2dc 100644
--- a/Sources/SwiftHtml/Tags/Blockquote.swift
+++ b/Sources/SwiftHtml/Tags/Blockquote.swift
@@ -10,7 +10,7 @@
 /// Browsers usually indent `<blockquote>` elements (look at example below to see how to remove the indentation).
 open class Blockquote: StandardTag {
     
-    override open class var `class`: AnyClass { Blockquote.self }
+    override open class var name: String { .init(Blockquote.self) }
 }
 
 public extension Blockquote {
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 0ccf7c7..6e352d9 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -12,5 +12,5 @@
 /// **Note:** There can only be one `<body>` element in an HTML document.
 open class Body: StandardTag {
     
-    override open class var `class`: AnyClass { Body.self }
+    override open class var name: String { .init(Body.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index 4c96f1b..8fffe30 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -12,7 +12,5 @@
 /// The `<br>` tag is an empty tag which means that it has no end tag.
 open class Br: EmptyTag {
     
-    public init() {
-        super.init(name: .init(Br.self))
-    }
+    override open class var name: String { .init(Br.self) }    
 }
diff --git a/Sources/SwiftHtml/Tags/Button.swift b/Sources/SwiftHtml/Tags/Button.swift
index acd1ebd..9cb8cfe 100644
--- a/Sources/SwiftHtml/Tags/Button.swift
+++ b/Sources/SwiftHtml/Tags/Button.swift
@@ -14,7 +14,7 @@
 /// **Tip:** You can easily style buttons with CSS! Look at the examples below or visit our CSS Buttons tutorial.
 open class Button: StandardTag {
     
-    override open class var `class`: AnyClass { Button.self }
+    override open class var name: String { .init(Button.self) }
 }
 
 public extension Button {
diff --git a/Sources/SwiftHtml/Tags/Canvas.swift b/Sources/SwiftHtml/Tags/Canvas.swift
index c5c164e..4b1c7ce 100644
--- a/Sources/SwiftHtml/Tags/Canvas.swift
+++ b/Sources/SwiftHtml/Tags/Canvas.swift
@@ -12,7 +12,7 @@
 /// Any text inside the `<canvas>` element will be displayed in browsers with JavaScript disabled and in browsers that do not support <canvas>.
 open class Canvas: StandardTag {
     
-    override open class var `class`: AnyClass { Canvas.self }
+    override open class var name: String { .init(Canvas.self) }
 }
 
 public extension Canvas {
diff --git a/Sources/SwiftHtml/Tags/Caption.swift b/Sources/SwiftHtml/Tags/Caption.swift
index 655f70b..65facd7 100644
--- a/Sources/SwiftHtml/Tags/Caption.swift
+++ b/Sources/SwiftHtml/Tags/Caption.swift
@@ -12,5 +12,5 @@
 /// **Tip:** By default, a table caption will be center-aligned above a table. However, the CSS properties text-align and caption-side can be used to align and place the caption.
 open class Caption: StandardTag {
     
-    override open class var `class`: AnyClass { Caption.self }
+    override open class var name: String { .init(Caption.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Cite.swift b/Sources/SwiftHtml/Tags/Cite.swift
index 6cb7858..a5bcb24 100644
--- a/Sources/SwiftHtml/Tags/Cite.swift
+++ b/Sources/SwiftHtml/Tags/Cite.swift
@@ -12,5 +12,5 @@
 /// The text in the `<cite>` element usually renders in italic.
 open class Cite: StandardTag {
     
-    override open class var `class`: AnyClass { Cite.self }
+    override open class var name: String { .init(Cite.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Code.swift b/Sources/SwiftHtml/Tags/Code.swift
index 04940e0..e116554 100644
--- a/Sources/SwiftHtml/Tags/Code.swift
+++ b/Sources/SwiftHtml/Tags/Code.swift
@@ -16,5 +16,5 @@
 /// - `<pre>`    Defines preformatted text
 open class Code: StandardTag {
     
-    override open class var `class`: AnyClass { Code.self }
+    override open class var name: String { .init(Code.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index 2790999..8abe598 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -10,9 +10,7 @@
 /// The `<col>` tag is useful for applying styles to entire columns, instead of repeating the styles for each cell, for each row.
 open class Col: EmptyTag {
     
-    public init() {
-        super.init(name: .init(Col.self))
-    }
+    override open class var name: String { .init(Col.self) }
 }
 
 public extension Col {
diff --git a/Sources/SwiftHtml/Tags/Colgroup.swift b/Sources/SwiftHtml/Tags/Colgroup.swift
index 2de0841..b6140a1 100644
--- a/Sources/SwiftHtml/Tags/Colgroup.swift
+++ b/Sources/SwiftHtml/Tags/Colgroup.swift
@@ -14,7 +14,7 @@
 /// **Tip:** To define different properties to a column within a `<colgroup>`, use the `<col>` tag within the `<colgroup>` tag.
 open class Colgroup: StandardTag {
     
-    override open class var `class`: AnyClass { Colgroup.self }
+    override open class var name: String { .init(Colgroup.self) }
 }
 
 public extension Colgroup {
diff --git a/Sources/SwiftHtml/Tags/Comment.swift b/Sources/SwiftHtml/Tags/Comment.swift
index 25779f0..61154c4 100644
--- a/Sources/SwiftHtml/Tags/Comment.swift
+++ b/Sources/SwiftHtml/Tags/Comment.swift
@@ -12,10 +12,14 @@
 /// Comments are not displayed in the browsers.
 /// You can use comments to explain your code, which can help you when you edit the source code at a later date.
 /// This is especially useful if you have a lot of code.
-open class Comment: Tag {
+open class Comment: TypedTag {
+    
+    override open class var type: Node.NodeType { .comment }
+    
+    override open class var name: String { .init(Comment.self) }
     
     public init(_ contents: String) {
-        super.init(node: .init(Comment.self))
+        super.init()
         setContents(contents)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Data.swift b/Sources/SwiftHtml/Tags/Data.swift
index ad47be7..e8cd289 100644
--- a/Sources/SwiftHtml/Tags/Data.swift
+++ b/Sources/SwiftHtml/Tags/Data.swift
@@ -12,7 +12,7 @@
 /// **Tip:** If the content is time- or date-related, use the `<time>` element instead.
 open class Data: StandardTag {
     
-    override open class var `class`: AnyClass { Data.self }
+    override open class var name: String { .init(Data.self) }
 }
 
 public extension Data {
diff --git a/Sources/SwiftHtml/Tags/Datalist.swift b/Sources/SwiftHtml/Tags/Datalist.swift
index 539e7f9..c8fc437 100644
--- a/Sources/SwiftHtml/Tags/Datalist.swift
+++ b/Sources/SwiftHtml/Tags/Datalist.swift
@@ -12,5 +12,5 @@
 /// The `<datalist>` element's id attribute must be equal to the `<input>` element's list attribute (this binds them together).
 open class Datalist: StandardTag {
     
-    override open class var `class`: AnyClass { Datalist.self }
+    override open class var name: String { .init(Datalist.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Dd.swift b/Sources/SwiftHtml/Tags/Dd.swift
index 40b2e27..6dca905 100644
--- a/Sources/SwiftHtml/Tags/Dd.swift
+++ b/Sources/SwiftHtml/Tags/Dd.swift
@@ -12,5 +12,5 @@
 /// Inside a `<dd>` tag you can put paragraphs, line breaks, images, links, lists, etc.
 open class Dd: StandardTag {
     
-    override open class var `class`: AnyClass { Dd.self }
+    override open class var name: String { .init(Dd.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Del.swift b/Sources/SwiftHtml/Tags/Del.swift
index 1ceb469..74de00c 100644
--- a/Sources/SwiftHtml/Tags/Del.swift
+++ b/Sources/SwiftHtml/Tags/Del.swift
@@ -10,7 +10,7 @@
 /// Browsers will usually strike a line through deleted text.
 open class Del: StandardTag {
     
-    override open class var `class`: AnyClass { Del.self }
+    override open class var name: String { .init(Del.self) }
 }
 
 public extension Del {
diff --git a/Sources/SwiftHtml/Tags/Details.swift b/Sources/SwiftHtml/Tags/Details.swift
index 9f92ace..1b532ca 100644
--- a/Sources/SwiftHtml/Tags/Details.swift
+++ b/Sources/SwiftHtml/Tags/Details.swift
@@ -14,7 +14,7 @@
 /// **Tip:** The `<summary>` tag is used in conjuction with `<details>` to specify a visible heading for the details.
 open class Details: StandardTag {
     
-    override open class var `class`: AnyClass { Details.self }
+    override open class var name: String { .init(Details.self) }
 }
 
 public extension Details {
diff --git a/Sources/SwiftHtml/Tags/Dfn.swift b/Sources/SwiftHtml/Tags/Dfn.swift
index 19b5ac2..e8ec7dc 100644
--- a/Sources/SwiftHtml/Tags/Dfn.swift
+++ b/Sources/SwiftHtml/Tags/Dfn.swift
@@ -13,5 +13,5 @@
 /// `<p><dfn>HTML</dfn> is the standard markup language for creating web pages.</p>`
 open class Dfn: StandardTag {
     
-    override open class var `class`: AnyClass { Dfn.self }
+    override open class var name: String { .init(Dfn.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Dialog.swift b/Sources/SwiftHtml/Tags/Dialog.swift
index 756ad9d..4fda5c3 100644
--- a/Sources/SwiftHtml/Tags/Dialog.swift
+++ b/Sources/SwiftHtml/Tags/Dialog.swift
@@ -10,7 +10,7 @@
 /// The `<dialog>` element makes it easy to create popup dialogs and modals on a web page.
 open class Dialog: StandardTag {
     
-    override open class var `class`: AnyClass { Dialog.self }
+    override open class var name: String { .init(Dialog.self) }
 }
 
 public extension Dialog {
diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index 6ee7ac3..fbeaf70 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -16,7 +16,7 @@
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
 open class Div: StandardTag {
     
-    override open class var `class`: AnyClass { Div.self }
+    override open class var name: String { .init(Div.self) }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Dl.swift b/Sources/SwiftHtml/Tags/Dl.swift
index f86d0c4..23a264f 100644
--- a/Sources/SwiftHtml/Tags/Dl.swift
+++ b/Sources/SwiftHtml/Tags/Dl.swift
@@ -10,5 +10,5 @@
 /// The `<dl>` tag is used in conjunction with `<dt>` (defines terms/names) and `<dd>` (describes each term/name).
 open class Dl: StandardTag {
     
-    override open class var `class`: AnyClass { Dl.self }
+    override open class var name: String { .init(Dl.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Dt.swift b/Sources/SwiftHtml/Tags/Dt.swift
index 9cba0ed..e40ab83 100644
--- a/Sources/SwiftHtml/Tags/Dt.swift
+++ b/Sources/SwiftHtml/Tags/Dt.swift
@@ -10,5 +10,5 @@
 /// The `<dt>` tag is used in conjunction with `<dl>` (defines a description list) and `<dd>` (describes each term/name).
 open class Dt: StandardTag {
     
-    override open class var `class`: AnyClass { Dt.self }
+    override open class var name: String { .init(Dt.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Em.swift b/Sources/SwiftHtml/Tags/Em.swift
index c42190b..88ccfb5 100644
--- a/Sources/SwiftHtml/Tags/Em.swift
+++ b/Sources/SwiftHtml/Tags/Em.swift
@@ -10,5 +10,5 @@
 /// A screen reader will pronounce the words in `<em>` with an emphasis, using verbal stress.
 open class Em: StandardTag {
     
-    override open class var `class`: AnyClass { Em.self }
+    override open class var name: String { .init(Em.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index e545392..87366ee 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -8,12 +8,9 @@
 /// The `<embed>` tag defines a container for an external resource, such as a web page, a picture, a media player, or a plug-in application.
 open class Embed: EmptyTag {
     
-    public init() {
-        super.init(name: .init(Embed.self))
-    }
+    override open class var name: String { .init(Embed.self) }
 }
 
-
 public extension Embed {
 
     /// Specifies the height of the embedded content
diff --git a/Sources/SwiftHtml/Tags/Fieldset.swift b/Sources/SwiftHtml/Tags/Fieldset.swift
index fdfdab2..3fa2c3c 100644
--- a/Sources/SwiftHtml/Tags/Fieldset.swift
+++ b/Sources/SwiftHtml/Tags/Fieldset.swift
@@ -10,7 +10,7 @@
 /// The `<fieldset>` tag draws a box around the related elements.
 open class Fieldset: StandardTag {
     
-    override open class var `class`: AnyClass { Fieldset.self }
+    override open class var name: String { .init(Fieldset.self) }
 }
 
 public extension Fieldset {
diff --git a/Sources/SwiftHtml/Tags/Figcaption.swift b/Sources/SwiftHtml/Tags/Figcaption.swift
index 8c5fa4a..d0b9582 100644
--- a/Sources/SwiftHtml/Tags/Figcaption.swift
+++ b/Sources/SwiftHtml/Tags/Figcaption.swift
@@ -10,5 +10,5 @@
 /// The `<figcaption>` element can be placed as the first or last child of the `<figure>` element.
 open class Figcaption: StandardTag {
     
-    override open class var `class`: AnyClass { Figcaption.self }
+    override open class var name: String { .init(Figcaption.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Figure.swift b/Sources/SwiftHtml/Tags/Figure.swift
index 89c4eb1..9e499f6 100644
--- a/Sources/SwiftHtml/Tags/Figure.swift
+++ b/Sources/SwiftHtml/Tags/Figure.swift
@@ -12,6 +12,6 @@
 /// **Tip:** The `<figcaption>` element is used to add a caption for the `<figure>` element.
 open class Figure: StandardTag {
     
-    override open class var `class`: AnyClass { Figure.self }
+    override open class var name: String { .init(Figure.self) }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Footer.swift b/Sources/SwiftHtml/Tags/Footer.swift
index 5d4f49c..d9af9fd 100644
--- a/Sources/SwiftHtml/Tags/Footer.swift
+++ b/Sources/SwiftHtml/Tags/Footer.swift
@@ -18,5 +18,5 @@
 /// You can have several `<footer>` elements in one document.
 open class Footer: StandardTag {
     
-    override open class var `class`: AnyClass { Footer.self }
+    override open class var name: String { .init(Footer.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Form.swift b/Sources/SwiftHtml/Tags/Form.swift
index 1cd1299..1d6f60b 100644
--- a/Sources/SwiftHtml/Tags/Form.swift
+++ b/Sources/SwiftHtml/Tags/Form.swift
@@ -20,7 +20,7 @@
 /// - `<output>`
 open class Form: StandardTag {
     
-    override open class var `class`: AnyClass { Form.self }
+    override open class var name: String { .init(Form.self) }
 }
 
 public extension Form {
diff --git a/Sources/SwiftHtml/Tags/H1.swift b/Sources/SwiftHtml/Tags/H1.swift
index bfdea38..02fffe9 100644
--- a/Sources/SwiftHtml/Tags/H1.swift
+++ b/Sources/SwiftHtml/Tags/H1.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H1: StandardTag {
     
-    override open class var `class`: AnyClass { H1.self }
+    override open class var name: String { .init(H1.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/H2.swift b/Sources/SwiftHtml/Tags/H2.swift
index b388e95..1e67cc3 100644
--- a/Sources/SwiftHtml/Tags/H2.swift
+++ b/Sources/SwiftHtml/Tags/H2.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H2: StandardTag {
     
-    override open class var `class`: AnyClass { H2.self }
+    override open class var name: String { .init(H2.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/H3.swift b/Sources/SwiftHtml/Tags/H3.swift
index ab7dadf..8e3e911 100644
--- a/Sources/SwiftHtml/Tags/H3.swift
+++ b/Sources/SwiftHtml/Tags/H3.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H3: StandardTag {
     
-    override open class var `class`: AnyClass { H3.self }
+    override open class var name: String { .init(H3.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/H4.swift b/Sources/SwiftHtml/Tags/H4.swift
index e10e0bd..a28935a 100644
--- a/Sources/SwiftHtml/Tags/H4.swift
+++ b/Sources/SwiftHtml/Tags/H4.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H4: StandardTag {
     
-    override open class var `class`: AnyClass { H4.self }
+    override open class var name: String { .init(H4.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/H5.swift b/Sources/SwiftHtml/Tags/H5.swift
index 64a8c84..13596a7 100644
--- a/Sources/SwiftHtml/Tags/H5.swift
+++ b/Sources/SwiftHtml/Tags/H5.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H5: StandardTag {
     
-    override open class var `class`: AnyClass { H5.self }
+    override open class var name: String { .init(H5.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/H6.swift b/Sources/SwiftHtml/Tags/H6.swift
index 232b55b..f1e28ea 100644
--- a/Sources/SwiftHtml/Tags/H6.swift
+++ b/Sources/SwiftHtml/Tags/H6.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H6: StandardTag {
     
-    override open class var `class`: AnyClass { H6.self }
+    override open class var name: String { .init(H6.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index 0f2007e..f44c8d5 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -22,5 +22,5 @@
 /// - `<noscript>`
 open class Head: StandardTag {
     
-    override open class var `class`: AnyClass { Head.self }
+    override open class var name: String { .init(Head.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Header.swift b/Sources/SwiftHtml/Tags/Header.swift
index c36bb8f..c493e39 100644
--- a/Sources/SwiftHtml/Tags/Header.swift
+++ b/Sources/SwiftHtml/Tags/Header.swift
@@ -15,6 +15,6 @@
 /// **Note:** You can have several` <header>` elements in one HTML document. However,` <header>` cannot be placed within a` <footer>`,` <address>` or another` <header>` element.
 open class Header: StandardTag {
     
-    override open class var `class`: AnyClass { Header.self }
+    override open class var name: String { .init(Header.self) }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index cabe2c1..8f9e65e 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -10,7 +10,5 @@
 /// The `<hr>` element is most often displayed as a horizontal rule that is used to separate content (or define a change) in an HTML page.
 open class Hr: EmptyTag {
     
-    public init() {
-        super.init(name: .init(Hr.self))
-    }
+    override open class var name: String { .init(Hr.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 87ea7ac..3922c41 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -12,7 +12,7 @@
 /// **Note:** You should always include the lang attribute inside the `<html>` tag, to declare the language of the Web page. This is meant to assist search engines and browsers.
 open class Html: StandardTag {
     
-    override open class var `class`: AnyClass { Html.self }
+    override open class var name: String { .init(Html.self) }
 }
 
 public extension Html {
diff --git a/Sources/SwiftHtml/Tags/I.swift b/Sources/SwiftHtml/Tags/I.swift
index 48f11da..3d870b6 100644
--- a/Sources/SwiftHtml/Tags/I.swift
+++ b/Sources/SwiftHtml/Tags/I.swift
@@ -18,5 +18,5 @@
 /// - `<dfn>` (a definition term)
 open class I: StandardTag {
     
-    override open class var `class`: AnyClass { I.self }
+    override open class var name: String { .init(I.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Iframe.swift b/Sources/SwiftHtml/Tags/Iframe.swift
index b40125f..155c2a7 100644
--- a/Sources/SwiftHtml/Tags/Iframe.swift
+++ b/Sources/SwiftHtml/Tags/Iframe.swift
@@ -14,7 +14,7 @@
 /// **Tip:** It is a good practice to always include a title attribute for the `<iframe>`. This is used by screen readers to read out what the content of the `<iframe>` is.
 open class Iframe: StandardTag {
     
-    override open class var `class`: AnyClass { Iframe.self }
+    override open class var name: String { .init(Iframe.self) }
 }
 
 public extension Iframe {
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index 630ae58..6306c6a 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -20,8 +20,10 @@
 /// **Tip:** To link an image to another document, simply nest the `<img>` tag inside an `<a>` tag (see example below).
 open class Img: EmptyTag {
     
+    override open class var name: String { .init(Img.self) }
+    
     public init(src: String, alt: String) {
-        super.init(name: .init(Img.self))
+        super.init()
         setAttributes([
             .init(key: "src", value: src),
             .init(key: "alt", value: alt),
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index 27d1d04..691628d 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -12,9 +12,7 @@
 /// The `<input>` element can be displayed in several ways, depending on the type attribute.
 open class Input: EmptyTag {
     
-    public init() {
-        super.init(name: .init(Input.self))
-    }
+    override open class var name: String { .init(Input.self) }
 }
 
 public extension Input {
diff --git a/Sources/SwiftHtml/Tags/Ins.swift b/Sources/SwiftHtml/Tags/Ins.swift
index 25fc056..21a32fd 100644
--- a/Sources/SwiftHtml/Tags/Ins.swift
+++ b/Sources/SwiftHtml/Tags/Ins.swift
@@ -10,5 +10,5 @@
 /// **Tip:** Also look at the `<del>` tag to markup deleted text.
 open class Ins: StandardTag {
     
-    override open class var `class`: AnyClass { Ins.self }
+    override open class var name: String { .init(Ins.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Kbd.swift b/Sources/SwiftHtml/Tags/Kbd.swift
index 1a82ab4..aa30015 100644
--- a/Sources/SwiftHtml/Tags/Kbd.swift
+++ b/Sources/SwiftHtml/Tags/Kbd.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS (see example below).
 open class Kbd: StandardTag {
     
-    override open class var `class`: AnyClass { Kbd.self }
+    override open class var name: String { .init(Kbd.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Label.swift b/Sources/SwiftHtml/Tags/Label.swift
index acb7bbd..738f1fc 100644
--- a/Sources/SwiftHtml/Tags/Label.swift
+++ b/Sources/SwiftHtml/Tags/Label.swift
@@ -35,7 +35,7 @@
 /// Users who have difficulty clicking on very small regions (such as checkboxes) - because when a user clicks the text within the `<label>` element, it toggles the input (this increases the hit area).
 open class Label: StandardTag {
     
-    override open class var `class`: AnyClass { Label.self }    
+    override open class var name: String { .init(Label.self) }
 }
 
 public extension Label {
diff --git a/Sources/SwiftHtml/Tags/Legend.swift b/Sources/SwiftHtml/Tags/Legend.swift
index 78d1d5c..ede96b4 100644
--- a/Sources/SwiftHtml/Tags/Legend.swift
+++ b/Sources/SwiftHtml/Tags/Legend.swift
@@ -8,5 +8,5 @@
 /// The `<legend>` tag defines a caption for the `<fieldset>` element.
 open class Legend: StandardTag {
     
-    override open class var `class`: AnyClass { Legend.self }
+    override open class var name: String { .init(Legend.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Li.swift b/Sources/SwiftHtml/Tags/Li.swift
index d679d50..e9d3aea 100644
--- a/Sources/SwiftHtml/Tags/Li.swift
+++ b/Sources/SwiftHtml/Tags/Li.swift
@@ -16,7 +16,7 @@
 /// **Tip:** Use CSS to style lists.
 open class Li: StandardTag {
     
-    override open class var `class`: AnyClass { Li.self }
+    override open class var name: String { .init(Li.self) }
 }
 
 public extension Li {
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index 82012e3..aa94b3a 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -12,8 +12,10 @@
 /// The `<link>` element is an empty element, it contains attributes only.
 open class Link: EmptyTag {
     
+    override open class var name: String { .init(Link.self) }
+    
     public init(rel: Rel) {
-        super.init(name: .init(Link.self))
+        super.init()
         setAttributes([
             Attribute(key: "rel", value: rel.rawValue),
         ])
diff --git a/Sources/SwiftHtml/Tags/MainTag.swift b/Sources/SwiftHtml/Tags/MainTag.swift
index e8f5a4d..aeb8178 100644
--- a/Sources/SwiftHtml/Tags/MainTag.swift
+++ b/Sources/SwiftHtml/Tags/MainTag.swift
@@ -12,7 +12,7 @@
 /// **Note:** There must not be more than one `<main>` element in a document. The `<main>` element must NOT be a descendant of an `<article>`, `<aside>`, `<footer>`, `<header>`, or `<nav>` element.
 open class Main: StandardTag {
     
-    override open class var `class`: AnyClass { Main.self }
+    override open class var name: String { .init(Main.self) }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index 9652f60..8aa8483 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -10,10 +10,12 @@
 /// The required name attribute of the `<map>` element is associated with the `<img>`'s usemap attribute and creates a relationship between the image and the map.
 ///
 /// The `<map>` element contains a number of `<area>` elements, that defines the clickable areas in the image map.
-open class Map: Tag {
+open class Map: StandardTag {
+    
+    override open class var name: String { .init(Map.self) }
         
     public init(name: String, @TagBuilder _ builder: () -> Tag) {
-        super.init(node: .init(Map.self), [builder()])
+        super.init([builder()])
         setAttributes([
             .init(key: "name", value: name)
         ])
diff --git a/Sources/SwiftHtml/Tags/Mark.swift b/Sources/SwiftHtml/Tags/Mark.swift
index ce82637..6f26d13 100644
--- a/Sources/SwiftHtml/Tags/Mark.swift
+++ b/Sources/SwiftHtml/Tags/Mark.swift
@@ -8,5 +8,5 @@
 /// The `<mark>` tag defines text that should be marked or highlighted.
 open class Mark: StandardTag {
     
-    override open class var `class`: AnyClass { Mark.self }
+    override open class var name: String { .init(Mark.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index dc4b4be..52e14ae 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -16,9 +16,7 @@
 /// There is a method to let web designers take control over the viewport (the user's visible area of a web page), through the `<meta>` tag (See "Setting The Viewport" example below).
 open class Meta: EmptyTag {
     
-    public init() {
-        super.init(name: .init(Meta.self))
-    }
+    override open class var name: String { .init(Meta.self) }
 }
 
 public extension Meta {
diff --git a/Sources/SwiftHtml/Tags/Meter.swift b/Sources/SwiftHtml/Tags/Meter.swift
index c9961b5..da980b9 100644
--- a/Sources/SwiftHtml/Tags/Meter.swift
+++ b/Sources/SwiftHtml/Tags/Meter.swift
@@ -12,10 +12,12 @@
 /// **Note:** The `<meter>` tag should not be used to indicate progress (as in a progress bar). For progress bars, use the `<progress>` tag.
 /// 
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
-open class Meter: Tag {
+open class Meter: StandardTag {
+    
+    override open class var name: String { .init(Meter.self) }
     
     public init(value: Int, _ contents: String) {
-        super.init(node: .init(Meter.self))
+        super.init()
         setContents(contents)
         setAttributes([
             .init(key: "value", value: String(value))
diff --git a/Sources/SwiftHtml/Tags/Nav.swift b/Sources/SwiftHtml/Tags/Nav.swift
index 13d8046..e5a9d80 100644
--- a/Sources/SwiftHtml/Tags/Nav.swift
+++ b/Sources/SwiftHtml/Tags/Nav.swift
@@ -12,7 +12,7 @@
 /// Browsers, such as screen readers for disabled users, can use this element to determine whether to omit the initial rendering of this content.
 open class Nav: StandardTag {
     
-    override open class var `class`: AnyClass { Nav.self }
+    override open class var name: String { .init(Nav.self) }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Noscript.swift b/Sources/SwiftHtml/Tags/Noscript.swift
index 9c33e53..d4e6996 100644
--- a/Sources/SwiftHtml/Tags/Noscript.swift
+++ b/Sources/SwiftHtml/Tags/Noscript.swift
@@ -10,5 +10,5 @@
 /// The `<noscript>` element can be used in both `<head>` and `<body>`. When used inside `<head>`, the `<noscript>` element could only contain `<link>`, `<style>`, and `<meta>` elements.
 open class Noscript: StandardTag {
     
-    override open class var `class`: AnyClass { Noscript.self }
+    override open class var name: String { .init(Noscript.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Object.swift b/Sources/SwiftHtml/Tags/Object.swift
index b6cc341..db4a762 100644
--- a/Sources/SwiftHtml/Tags/Object.swift
+++ b/Sources/SwiftHtml/Tags/Object.swift
@@ -10,7 +10,7 @@
 /// The external resource can be a web page, a picture, a media player, or a plug-in application.
 open class Object: StandardTag {
     
-    override open class var `class`: AnyClass { Object.self }
+    override open class var name: String { .init(Object.self) }
 }
 
 public extension Object {
diff --git a/Sources/SwiftHtml/Tags/Ol.swift b/Sources/SwiftHtml/Tags/Ol.swift
index 2c37516..192f175 100644
--- a/Sources/SwiftHtml/Tags/Ol.swift
+++ b/Sources/SwiftHtml/Tags/Ol.swift
@@ -14,7 +14,7 @@
 /// **Tip:** For unordered list, use the `<ul>` tag.
 open class Ol: StandardTag {
     
-    override open class var `class`: AnyClass { Ol.self }
+    override open class var name: String { .init(Ol.self) }
 }
 
 public extension Ol {
diff --git a/Sources/SwiftHtml/Tags/Optgroup.swift b/Sources/SwiftHtml/Tags/Optgroup.swift
index a43960e..45dfee8 100644
--- a/Sources/SwiftHtml/Tags/Optgroup.swift
+++ b/Sources/SwiftHtml/Tags/Optgroup.swift
@@ -10,7 +10,7 @@
 /// If you have a long list of options, groups of related options are easier to handle for a user.
 open class Optgroup: StandardTag {
     
-    override open class var `class`: AnyClass { Optgroup.self }
+    override open class var name: String { .init(Optgroup.self) }
 }
 
 public extension Optgroup {
diff --git a/Sources/SwiftHtml/Tags/Option.swift b/Sources/SwiftHtml/Tags/Option.swift
index 984094d..06e7470 100644
--- a/Sources/SwiftHtml/Tags/Option.swift
+++ b/Sources/SwiftHtml/Tags/Option.swift
@@ -14,7 +14,7 @@
 /// **Tip:** If you have a long list of options, you can group related options within the `<optgroup>` tag.
 open class Option: StandardTag {
     
-    override open class var `class`: AnyClass { Option.self }
+    override open class var name: String { .init(Option.self) }
 }
 
 public extension Option {
diff --git a/Sources/SwiftHtml/Tags/Output.swift b/Sources/SwiftHtml/Tags/Output.swift
index 676efda..67fcb68 100644
--- a/Sources/SwiftHtml/Tags/Output.swift
+++ b/Sources/SwiftHtml/Tags/Output.swift
@@ -8,7 +8,7 @@
 /// The `<output>` tag is used to represent the result of a calculation (like one performed by a script).
 open class Output: StandardTag {
     
-    override open class var `class`: AnyClass { Output.self }
+    override open class var name: String { .init(Output.self) }
 }
 
 public extension Output {
diff --git a/Sources/SwiftHtml/Tags/P.swift b/Sources/SwiftHtml/Tags/P.swift
index b3457f6..7c3b0be 100644
--- a/Sources/SwiftHtml/Tags/P.swift
+++ b/Sources/SwiftHtml/Tags/P.swift
@@ -12,5 +12,5 @@
 /// **Tip:** Use CSS to style paragraphs.
 open class P: StandardTag {
     
-    override open class var `class`: AnyClass { P.self }
+    override open class var name: String { .init(P.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index cac6454..103728c 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -8,9 +8,7 @@
 /// The `<param>` tag is used to define parameters for an `<object>` element.
 open class Param: EmptyTag {
     
-    public init() {
-        super.init(name: .init(Param.self))
-    }
+    override open class var name: String { .init(Param.self) }
 }
 
 public extension Param {
diff --git a/Sources/SwiftHtml/Tags/Picture.swift b/Sources/SwiftHtml/Tags/Picture.swift
index 0f7ca51..fe4c6c9 100644
--- a/Sources/SwiftHtml/Tags/Picture.swift
+++ b/Sources/SwiftHtml/Tags/Picture.swift
@@ -18,5 +18,5 @@
 /// **Tip:** The `<picture>` element works "similar" to `<video>` and `<audio>`. You set up different sources, and the first source that fits the preferences is the one being used.
 open class Picture: StandardTag {
     
-    override open class var `class`: AnyClass { Picture.self }
+    override open class var name: String { .init(Picture.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Pre.swift b/Sources/SwiftHtml/Tags/Pre.swift
index 1281280..5c43636 100644
--- a/Sources/SwiftHtml/Tags/Pre.swift
+++ b/Sources/SwiftHtml/Tags/Pre.swift
@@ -11,5 +11,5 @@
 /// The text will be displayed exactly as written in the HTML source code.
 open class Pre: StandardTag {
     
-    override open class var `class`: AnyClass { Pre.self }
+    override open class var name: String { .init(Pre.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Progress.swift b/Sources/SwiftHtml/Tags/Progress.swift
index cb1b166..917b461 100644
--- a/Sources/SwiftHtml/Tags/Progress.swift
+++ b/Sources/SwiftHtml/Tags/Progress.swift
@@ -10,7 +10,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Progress: StandardTag {
     
-    override open class var `class`: AnyClass { Progress.self }
+    override open class var name: String { .init(Progress.self) }
 }
 
 public extension Progress {
diff --git a/Sources/SwiftHtml/Tags/Q.swift b/Sources/SwiftHtml/Tags/Q.swift
index c12b69d..8087bdb 100644
--- a/Sources/SwiftHtml/Tags/Q.swift
+++ b/Sources/SwiftHtml/Tags/Q.swift
@@ -12,7 +12,7 @@
 /// **Tip:** Use `<blockquote>` for long quotations.
 open class Q: StandardTag {
     
-    override open class var `class`: AnyClass { Q.self }
+    override open class var name: String { .init(Q.self) }
 }
 
 public extension Q {
diff --git a/Sources/SwiftHtml/Tags/Rp.swift b/Sources/SwiftHtml/Tags/Rp.swift
index fc40e6c..63d3ad8 100644
--- a/Sources/SwiftHtml/Tags/Rp.swift
+++ b/Sources/SwiftHtml/Tags/Rp.swift
@@ -10,5 +10,5 @@
 /// Use `<rp>` together with `<ruby>` and `<rt>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rp: StandardTag {
     
-    override open class var `class`: AnyClass { Rp.self }
+    override open class var name: String { .init(Rp.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Rt.swift b/Sources/SwiftHtml/Tags/Rt.swift
index 4e11d53..ba5ba65 100644
--- a/Sources/SwiftHtml/Tags/Rt.swift
+++ b/Sources/SwiftHtml/Tags/Rt.swift
@@ -10,5 +10,5 @@
 /// Use `<rt>` together with `<ruby>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rt: StandardTag {
     
-    override open class var `class`: AnyClass { Rt.self }
+    override open class var name: String { .init(Rt.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Ruby.swift b/Sources/SwiftHtml/Tags/Ruby.swift
index 274dd58..f3c2ff5 100644
--- a/Sources/SwiftHtml/Tags/Ruby.swift
+++ b/Sources/SwiftHtml/Tags/Ruby.swift
@@ -12,5 +12,5 @@
 /// Use `<ruby>` together with `<rt>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that do not support ruby annotations.
 open class Ruby: StandardTag {
     
-    override open class var `class`: AnyClass { Ruby.self }
+    override open class var name: String { .init(Ruby.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/S.swift b/Sources/SwiftHtml/Tags/S.swift
index 9215691..2a3f234 100644
--- a/Sources/SwiftHtml/Tags/S.swift
+++ b/Sources/SwiftHtml/Tags/S.swift
@@ -10,5 +10,5 @@
 /// The `<s>` tag should not be used to define deleted text in a document, use the `<del>` tag for that.
 open class S: StandardTag {
     
-    override open class var `class`: AnyClass { S.self }
+    override open class var name: String { .init(S.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Samp.swift b/Sources/SwiftHtml/Tags/Samp.swift
index d64d5dc..c3d4c90 100644
--- a/Sources/SwiftHtml/Tags/Samp.swift
+++ b/Sources/SwiftHtml/Tags/Samp.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Samp: StandardTag {
     
-    override open class var `class`: AnyClass { Samp.self }
+    override open class var name: String { .init(Samp.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Script.swift b/Sources/SwiftHtml/Tags/Script.swift
index 8fd8d70..2bd757a 100644
--- a/Sources/SwiftHtml/Tags/Script.swift
+++ b/Sources/SwiftHtml/Tags/Script.swift
@@ -12,7 +12,7 @@
 /// Common uses for JavaScript are image manipulation, form validation, and dynamic changes of content.
 open class Script: StandardTag {
     
-    override open class var `class`: AnyClass { Script.self }
+    override open class var name: String { .init(Script.self) }
     
     public enum `Type`: String {
         case javascript = "text/javascript"
diff --git a/Sources/SwiftHtml/Tags/Section.swift b/Sources/SwiftHtml/Tags/Section.swift
index a23d5e0..e63c1e2 100644
--- a/Sources/SwiftHtml/Tags/Section.swift
+++ b/Sources/SwiftHtml/Tags/Section.swift
@@ -8,5 +8,5 @@
 /// The `<section>` tag defines a section in a document.
 open class Section: StandardTag {
     
-    override open class var `class`: AnyClass { Section.self }
+    override open class var name: String { .init(Section.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Select.swift b/Sources/SwiftHtml/Tags/Select.swift
index d563bb3..cfedecf 100644
--- a/Sources/SwiftHtml/Tags/Select.swift
+++ b/Sources/SwiftHtml/Tags/Select.swift
@@ -18,7 +18,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Select: StandardTag {
     
-    override open class var `class`: AnyClass { Select.self }
+    override open class var name: String { .init(Select.self) }
 }
 
 public extension Select {
diff --git a/Sources/SwiftHtml/Tags/Small.swift b/Sources/SwiftHtml/Tags/Small.swift
index cd6dfaf..c0b7a02 100644
--- a/Sources/SwiftHtml/Tags/Small.swift
+++ b/Sources/SwiftHtml/Tags/Small.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated, but it is possible to achieve richer (or the same) effect with CSS.
 open class Small: StandardTag {
     
-    override open class var `class`: AnyClass { Small.self }
+    override open class var name: String { .init(Small.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index bd623bf..1e05cba 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -12,9 +12,7 @@
 /// The browser will choose the first `<source>` it supports.
 open class Source: EmptyTag {
     
-    public init() {
-        super.init(name: .init(Source.self))
-    }
+    override open class var name: String { .init(Source.self) }
 }
 
 public extension Source {
diff --git a/Sources/SwiftHtml/Tags/Span.swift b/Sources/SwiftHtml/Tags/Span.swift
index f605c12..70e226e 100644
--- a/Sources/SwiftHtml/Tags/Span.swift
+++ b/Sources/SwiftHtml/Tags/Span.swift
@@ -12,5 +12,5 @@
 /// The `<span>` tag is much like the `<div>` element, but `<div>` is a block-level element and `<span>` is an inline element.
 open class Span: StandardTag {
     
-    override open class var `class`: AnyClass { Span.self }
+    override open class var name: String { .init(Span.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Strong.swift b/Sources/SwiftHtml/Tags/Strong.swift
index bd962fc..0d2a714 100644
--- a/Sources/SwiftHtml/Tags/Strong.swift
+++ b/Sources/SwiftHtml/Tags/Strong.swift
@@ -10,5 +10,5 @@
 /// **Tip:** Use the `<b>` tag to specify bold text without any extra importance!
 open class Strong: StandardTag {
     
-    override open class var `class`: AnyClass { Strong.self }
+    override open class var name: String { .init(Strong.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Style.swift b/Sources/SwiftHtml/Tags/Style.swift
index bfc0667..1750db3 100644
--- a/Sources/SwiftHtml/Tags/Style.swift
+++ b/Sources/SwiftHtml/Tags/Style.swift
@@ -11,7 +11,7 @@
 /// Inside the `<style>` element you specify how HTML elements should render in a browser.
 open class Style: StandardTag {
     
-    override open class var `class`: AnyClass { Style.self }
+    override open class var name: String { .init(Style.self) }
 }
 
 public extension Style {
diff --git a/Sources/SwiftHtml/Tags/Sub.swift b/Sources/SwiftHtml/Tags/Sub.swift
index 72bb407..71413e4 100644
--- a/Sources/SwiftHtml/Tags/Sub.swift
+++ b/Sources/SwiftHtml/Tags/Sub.swift
@@ -13,5 +13,5 @@
 /// **Tip:** Use the `<sup>` tag to define superscripted text.
 open class Sub: StandardTag {
     
-    override open class var `class`: AnyClass { Sub.self }
+    override open class var name: String { .init(Sub.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Summary.swift b/Sources/SwiftHtml/Tags/Summary.swift
index 6c1dc91..e1cfca1 100644
--- a/Sources/SwiftHtml/Tags/Summary.swift
+++ b/Sources/SwiftHtml/Tags/Summary.swift
@@ -10,5 +10,5 @@
 /// **Note:** The `<summary>` element should be the first child element of the `<details>` element.
 open class Summary: StandardTag {
     
-    override open class var `class`: AnyClass { Summary.self }
+    override open class var name: String { .init(Summary.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Sup.swift b/Sources/SwiftHtml/Tags/Sup.swift
index ca85af3..91982f8 100644
--- a/Sources/SwiftHtml/Tags/Sup.swift
+++ b/Sources/SwiftHtml/Tags/Sup.swift
@@ -13,5 +13,5 @@
 /// **Tip:** Use the `<sub>` tag to define subscript text.
 open class Sup: StandardTag {
     
-    override open class var `class`: AnyClass { Sup.self }
+    override open class var name: String { .init(Sup.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Table.swift b/Sources/SwiftHtml/Tags/Table.swift
index 2c39787..4889371 100644
--- a/Sources/SwiftHtml/Tags/Table.swift
+++ b/Sources/SwiftHtml/Tags/Table.swift
@@ -14,5 +14,5 @@
 /// An HTML table may also include `<caption>`, `<colgroup>`, `<thead>`, `<tfoot>`, and `<tbody>` elements.
 open class Table: StandardTag {
     
-    override open class var `class`: AnyClass { Table.self }
+    override open class var name: String { .init(Table.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Tbody.swift b/Sources/SwiftHtml/Tags/Tbody.swift
index 6574e3c..1781848 100644
--- a/Sources/SwiftHtml/Tags/Tbody.swift
+++ b/Sources/SwiftHtml/Tags/Tbody.swift
@@ -19,6 +19,6 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tbody: StandardTag {
     
-    override open class var `class`: AnyClass { Tbody.self }
+    override open class var name: String { .init(Tbody.self) }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Td.swift b/Sources/SwiftHtml/Tags/Td.swift
index 68b9935..fe2f8db 100644
--- a/Sources/SwiftHtml/Tags/Td.swift
+++ b/Sources/SwiftHtml/Tags/Td.swift
@@ -17,7 +17,7 @@
 /// The text in `<th>` elements are bold and centered by default.
 open class Td: StandardTag {
     
-    override open class var `class`: AnyClass { Td.self }
+    override open class var name: String { .init(Td.self) }
 }
 
 public extension Td {
diff --git a/Sources/SwiftHtml/Tags/Template.swift b/Sources/SwiftHtml/Tags/Template.swift
index f3fe1d6..5ae1298 100644
--- a/Sources/SwiftHtml/Tags/Template.swift
+++ b/Sources/SwiftHtml/Tags/Template.swift
@@ -13,7 +13,7 @@
 /// To do this without the `<template>` tag, you have to create the HTML code with JavaScript to prevent the browser from rendering the code.
 open class Template: StandardTag {
     
-    override open class var `class`: AnyClass { Template.self }
+    override open class var name: String { .init(Template.self) }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Textarea.swift b/Sources/SwiftHtml/Tags/Textarea.swift
index 7b3af4b..9731543 100644
--- a/Sources/SwiftHtml/Tags/Textarea.swift
+++ b/Sources/SwiftHtml/Tags/Textarea.swift
@@ -20,7 +20,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Textarea: StandardTag {
     
-    override open class var `class`: AnyClass { Textarea.self }
+    override open class var name: String { .init(Textarea.self) }
 }
 
 public extension Textarea {
diff --git a/Sources/SwiftHtml/Tags/Tfoot.swift b/Sources/SwiftHtml/Tags/Tfoot.swift
index 1b1d3fe..d28844c 100644
--- a/Sources/SwiftHtml/Tags/Tfoot.swift
+++ b/Sources/SwiftHtml/Tags/Tfoot.swift
@@ -19,5 +19,5 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tfoot: StandardTag {
     
-    override open class var `class`: AnyClass { Tfoot.self }
+    override open class var name: String { .init(Tfoot.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Th.swift b/Sources/SwiftHtml/Tags/Th.swift
index d5932ca..4ca0a75 100644
--- a/Sources/SwiftHtml/Tags/Th.swift
+++ b/Sources/SwiftHtml/Tags/Th.swift
@@ -17,7 +17,7 @@
 /// The text in `<td>` elements are regular and left-aligned by default.
 open class Th: StandardTag {
     
-    override open class var `class`: AnyClass { Th.self }
+    override open class var name: String { .init(Th.self) }
 }
 
 public extension Th {
diff --git a/Sources/SwiftHtml/Tags/Thead.swift b/Sources/SwiftHtml/Tags/Thead.swift
index 6191c0d..814838c 100644
--- a/Sources/SwiftHtml/Tags/Thead.swift
+++ b/Sources/SwiftHtml/Tags/Thead.swift
@@ -19,5 +19,5 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Thead: StandardTag {
     
-    override open class var `class`: AnyClass { Thead.self }
+    override open class var name: String { .init(Thead.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Time.swift b/Sources/SwiftHtml/Tags/Time.swift
index 4a532ae..b101f86 100644
--- a/Sources/SwiftHtml/Tags/Time.swift
+++ b/Sources/SwiftHtml/Tags/Time.swift
@@ -10,7 +10,7 @@
 /// The datetime attribute of this element is used translate the time into a machine-readable format so that browsers can offer to add date reminders through the user's calendar, and search engines can produce smarter search results.
 open class Time: StandardTag {
     
-    override open class var `class`: AnyClass { Time.self }
+    override open class var name: String { .init(Time.self) }
 }
 
 public extension Time {
diff --git a/Sources/SwiftHtml/Tags/Title.swift b/Sources/SwiftHtml/Tags/Title.swift
index 1932fc7..bcb245b 100644
--- a/Sources/SwiftHtml/Tags/Title.swift
+++ b/Sources/SwiftHtml/Tags/Title.swift
@@ -28,5 +28,5 @@
 /// **Note:** You can NOT have more than one `<title>` element in an HTML document.
 open class Title: StandardTag {
     
-    override open class var `class`: AnyClass { Title.self }
+    override open class var name: String { .init(Title.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Tr.swift b/Sources/SwiftHtml/Tags/Tr.swift
index a9241aa..bda4d9a 100644
--- a/Sources/SwiftHtml/Tags/Tr.swift
+++ b/Sources/SwiftHtml/Tags/Tr.swift
@@ -10,5 +10,5 @@
 /// A `<tr>` element contains one or more `<th>` or `<td>` elements.
 open class Tr: StandardTag {
     
-    override open class var `class`: AnyClass { Tr.self }
+    override open class var name: String { .init(Tr.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index 1ce6553..782b5b8 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -12,8 +12,10 @@
 /// Tracks are formatted in WebVTT format (.vtt files).
 open class Track: EmptyTag {
     
+    override open class var name: String { .init(Track.self) }
+    
     public init(src: String) {
-        super.init(name: .init(Track.self))
+        super.init()
         setAttributes([
             .init(key: "src", value: src)
         ])
diff --git a/Sources/SwiftHtml/Tags/U.swift b/Sources/SwiftHtml/Tags/U.swift
index 84ea523..ed4138e 100644
--- a/Sources/SwiftHtml/Tags/U.swift
+++ b/Sources/SwiftHtml/Tags/U.swift
@@ -13,5 +13,5 @@
 /// **Tip:** Avoid using the `<u>` element where it could be confused for a hyperlink!
 open class U: StandardTag {
     
-    override open class var `class`: AnyClass { U.self }
+    override open class var name: String { .init(U.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Ul.swift b/Sources/SwiftHtml/Tags/Ul.swift
index 77a6c54..b0d0e44 100644
--- a/Sources/SwiftHtml/Tags/Ul.swift
+++ b/Sources/SwiftHtml/Tags/Ul.swift
@@ -14,5 +14,5 @@
 /// **Tip:** For ordered lists, use the `<ol>` tag.
 open class Ul: StandardTag {
     
-    override open class var `class`: AnyClass { Ul.self }
+    override open class var name: String { .init(Ul.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Var.swift b/Sources/SwiftHtml/Tags/Var.swift
index 6051626..321a5fc 100644
--- a/Sources/SwiftHtml/Tags/Var.swift
+++ b/Sources/SwiftHtml/Tags/Var.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Var: StandardTag {
     
-    override open class var `class`: AnyClass { Var.self }
+    override open class var name: String { .init(Var.self) }
 }
diff --git a/Sources/SwiftHtml/Tags/Video.swift b/Sources/SwiftHtml/Tags/Video.swift
index d44188b..fdcd73c 100644
--- a/Sources/SwiftHtml/Tags/Video.swift
+++ b/Sources/SwiftHtml/Tags/Video.swift
@@ -22,7 +22,7 @@
 ///     Opera   | YES | YES  | YES
 open class Video: StandardTag {
     
-    override open class var `class`: AnyClass { Video.self }
+    override open class var name: String { .init(Video.self) }
 }
 
 public extension Video {
diff --git a/Sources/SwiftHtml/Tags/Wbr.swift b/Sources/SwiftHtml/Tags/Wbr.swift
index ed34592..49a67b9 100644
--- a/Sources/SwiftHtml/Tags/Wbr.swift
+++ b/Sources/SwiftHtml/Tags/Wbr.swift
@@ -10,5 +10,5 @@
 /// **Tip:** When a word is too long, the browser might break it at the wrong place. You can use the `<wbr>` element to add word break opportunities.
 open class Wbr: StandardTag {
     
-    override open class var `class`: AnyClass { Wbr.self }
+    override open class var name: String { .init(Wbr.self) }
 }
diff --git a/Sources/SwiftRss/Channel.swift b/Sources/SwiftRss/Channel.swift
index ed1e323..3ef59b7 100644
--- a/Sources/SwiftRss/Channel.swift
+++ b/Sources/SwiftRss/Channel.swift
@@ -5,6 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-public class Channel: Tag {
+public class Channel: StandardTag {
     
+    override open class var name: String { .init(Channel.self) }
 }
diff --git a/Sources/SwiftRss/Description.swift b/Sources/SwiftRss/Description.swift
index 0651f20..c92abb0 100644
--- a/Sources/SwiftRss/Description.swift
+++ b/Sources/SwiftRss/Description.swift
@@ -5,7 +5,9 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class Description: Tag {
+open class Description: StandardTag {
+    
+    override open class var name: String { .init(Description.self) }
     
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftRss/Guid.swift b/Sources/SwiftRss/Guid.swift
index 98b1df2..f081dce 100644
--- a/Sources/SwiftRss/Guid.swift
+++ b/Sources/SwiftRss/Guid.swift
@@ -5,7 +5,9 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class Guid: Tag {
+open class Guid: StandardTag {
+    
+    override open class var name: String { .init(Guid.self) }
 
 }
 
diff --git a/Sources/SwiftRss/Item.swift b/Sources/SwiftRss/Item.swift
index 88f312c..f645792 100644
--- a/Sources/SwiftRss/Item.swift
+++ b/Sources/SwiftRss/Item.swift
@@ -6,7 +6,7 @@
 //
 
 
-public class Item: Tag {
-    
+public class Item: StandardTag {
     
+    override open class var name: String { .init(Item.self) }
 }
diff --git a/Sources/SwiftRss/Language.swift b/Sources/SwiftRss/Language.swift
index 483501e..f568d83 100644
--- a/Sources/SwiftRss/Language.swift
+++ b/Sources/SwiftRss/Language.swift
@@ -5,6 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class Language: Tag {
+open class Language: StandardTag {
 
+    override open class var name: String { .init(Language.self) }
 }
diff --git a/Sources/SwiftRss/LastBuildDate.swift b/Sources/SwiftRss/LastBuildDate.swift
index 28ffbd9..b76a67f 100644
--- a/Sources/SwiftRss/LastBuildDate.swift
+++ b/Sources/SwiftRss/LastBuildDate.swift
@@ -6,4 +6,7 @@
 //
 
 
-open class LastBuildDate: Tag {}
+open class LastBuildDate: StandardTag {
+    
+    override open class var name: String { .init(LastBuildDate.self) }
+}
diff --git a/Sources/SwiftRss/Link.swift b/Sources/SwiftRss/Link.swift
index 1e592cc..d5df1e0 100644
--- a/Sources/SwiftRss/Link.swift
+++ b/Sources/SwiftRss/Link.swift
@@ -5,6 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class Link: Tag {
+open class Link: StandardTag {
 
+    override open class var name: String { .init(Link.self) }
 }
diff --git a/Sources/SwiftRss/PubDate.swift b/Sources/SwiftRss/PubDate.swift
index 627d286..eeba3ae 100644
--- a/Sources/SwiftRss/PubDate.swift
+++ b/Sources/SwiftRss/PubDate.swift
@@ -5,4 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class PubDate: Tag {}
+open class PubDate: StandardTag {
+    
+    override open class var name: String { .init(PubDate.self) }
+}
diff --git a/Sources/SwiftRss/Rss.swift b/Sources/SwiftRss/Rss.swift
index b141609..67770da 100644
--- a/Sources/SwiftRss/Rss.swift
+++ b/Sources/SwiftRss/Rss.swift
@@ -6,10 +6,12 @@
 //
 
 // https://validator.w3.org/feed/docs/rss2.html#ltttlgtSubelementOfLtchannelgt
-open class Rss: Tag {
+open class Rss: StandardTag {
+    
+    override open class var name: String { .init(Rss.self) }
     
     public init(@TagBuilder _ builder: () -> Tag) {
-        super.init(node: .init(Rss.self), [builder()])
+        super.init([builder()])
         setAttributes([
             .init(key: "version", value: "2.0"),
 //            .init(key: "xmlns:atom", value: "http://www.w3.org/2005/Atom"),
diff --git a/Sources/SwiftRss/Title.swift b/Sources/SwiftRss/Title.swift
index a984936..751f01a 100644
--- a/Sources/SwiftRss/Title.swift
+++ b/Sources/SwiftRss/Title.swift
@@ -5,7 +5,9 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class Title: Tag {
+open class Title: StandardTag {
+    
+    override open class var name: String { .init(Title.self) }
 
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftRss/Ttl.swift b/Sources/SwiftRss/Ttl.swift
index 962f9bb..3a39a81 100644
--- a/Sources/SwiftRss/Ttl.swift
+++ b/Sources/SwiftRss/Ttl.swift
@@ -5,7 +5,9 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class Ttl: Tag {
+open class Ttl: StandardTag {
+    
+    override open class var name: String { .init(Ttl.self) }
 
     public init(_ value: Int) {
         super.init()
diff --git a/Sources/SwiftSgml/Attribute.swift b/Sources/SwiftSgml/Attribute.swift
index 1242cde..6dfd618 100644
--- a/Sources/SwiftSgml/Attribute.swift
+++ b/Sources/SwiftSgml/Attribute.swift
@@ -6,7 +6,7 @@
 //
 
 public struct Attribute {
-
+    
     public var key: String
     public var value: String?
     
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index d8ad053..649a243 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -5,34 +5,7 @@
 //  Created by Tibor Bodecs on 2022. 02. 11..
 //
 
-open class EmptyTag: Tag {
+open class EmptyTag: TypedTag {
     
-    open class func node(_ name: String) -> Node {
-        .init(type: .empty, name: name)
-    }
-    
-    public init(name: String, _ children: [Tag] = []) {
-        super.init(node: Self.node(name), children)
-    }
-    
-    public init(name: String, @TagBuilder _ builder: () -> Tag) {
-        super.init(node:Self.node(name), [builder()])
-    }
-    
-    public convenience init(name: String, _ child: Tag) {
-        self.init(name: name, [child])
-    }
-    
-    public convenience init(name: String, _ contents: String?) {
-        self.init(name: name)
-        setContents(contents)
-    }
-}
-
-extension String {
-    
-    public init(_ `class`: AnyClass) {
-        self.init(describing: `class`.self)
-        _ = lowercased()
-    }
+    override open class var type: Node.NodeType { .empty }
 }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
index 87c259b..eeee847 100644
--- a/Sources/SwiftSgml/GroupTag.swift
+++ b/Sources/SwiftSgml/GroupTag.swift
@@ -5,25 +5,7 @@
 //  Created by Tibor Bodecs on 2022. 02. 11..
 //
 
-
-open class GroupTag: Tag {
-    
-    static var node: Node { .init(type: .group) }
-
-    public init(_ children: [Tag] = []) {
-        super.init(node: Self.node, children)
-    }
-    
-    public init(@TagBuilder _ builder: () -> Tag) {
-        super.init(node: Self.node, [builder()])
-    }
-    
-    public convenience init(_ child: Tag) {
-        self.init([child])
-    }
-    
-    public convenience init(_ contents: String?) {
-        self.init()
-        setContents(contents)
-    }
+open class GroupTag: TypedTag {
+        
+    override open class var type: Node.NodeType { .group }
 }
diff --git a/Sources/SwiftSgml/Node.swift b/Sources/SwiftSgml/Node.swift
index 28d01aa..00f577e 100644
--- a/Sources/SwiftSgml/Node.swift
+++ b/Sources/SwiftSgml/Node.swift
@@ -35,10 +35,6 @@ public struct Node {
         self.contents = contents
         self.attributes = attributes
     }
-    
-    public init(_ `class`: AnyClass) {
-        self.init(name: String(describing: `class`.self).lowercased())
-    }
 }
 
 public extension Node {
diff --git a/Sources/SwiftSgml/StandardTag.swift b/Sources/SwiftSgml/StandardTag.swift
index 0f751c6..c6b8ff5 100644
--- a/Sources/SwiftSgml/StandardTag.swift
+++ b/Sources/SwiftSgml/StandardTag.swift
@@ -1,24 +1,11 @@
 //
-//  File.swift
+//  StandardTag.swift
 //  
 //
 //  Created by Brad Gourley on 7/9/23.
 //
 
-open class StandardTag: Tag {
+open class StandardTag: TypedTag {
     
-    open class var `class`: AnyClass { StandardTag.self }
-    
-    public init(_ children: [Tag] = []) {
-        super.init(node: .init(Self.`class`), children)
-    }
-    
-    public convenience init(@TagBuilder _ builder: () -> Tag) {
-        self.init([builder()])
-    }
-    
-    public convenience init(_ contents: String) {
-        self.init()
-        setContents(contents)
-    }
+    override open class var type: Node.NodeType { .standard }
 }
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
new file mode 100644
index 0000000..803f935
--- /dev/null
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -0,0 +1,56 @@
+//
+//  TypedTag.swift
+//  
+//
+//  Created by Brad Gourley on 7/10/23.
+//
+
+open class TypedTag: Tag {
+    
+    open class var type: Node.NodeType { .standard }
+    
+    open class var name: String { .init(self).lowercased() }
+    
+    private class func node(name: String? = nil,
+                            contents: String? = nil,
+                            attributes: [Attribute] = []) -> Node {
+        Node(type: Self.type, name: name ?? Self.name, contents: contents, attributes: attributes)
+    }
+    
+    public init(name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute] = [],
+                _ children: [Tag] = []) {
+        let node = Self.node(name: name ?? Self.name, contents: contents, attributes: attributes)
+        super.init(node: node, children)
+    }
+    
+    public convenience init(name: String? = nil,
+                            contents: String? = nil,
+                            attributes: [Attribute] = [],
+                            _ child: Tag) {
+        self.init(name: name, contents: contents, attributes: attributes, [child])
+    }
+    
+    public convenience init(name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute] = [],
+                @TagBuilder _ builder: () -> Tag) {
+        self.init(name: name, contents: contents, attributes: attributes, [builder()])
+    }
+    
+    public convenience init(name: String? = nil,
+                            attributes: [Attribute] = [],
+                            _ contents: String?) {
+        
+        self.init(name: name, contents: contents, attributes: attributes)
+    }
+}
+
+public extension String {
+    
+    /// convert class names into node names
+    init(_ `class`: AnyClass) {
+        self.init(stringLiteral: .init(describing: `class`.self).lowercased())
+    }
+}
diff --git a/Sources/SwiftSitemap/ChangeFreq.swift b/Sources/SwiftSitemap/ChangeFreq.swift
index 0d90f85..3d26129 100644
--- a/Sources/SwiftSitemap/ChangeFreq.swift
+++ b/Sources/SwiftSitemap/ChangeFreq.swift
@@ -5,7 +5,9 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class ChangeFreq: Tag {
+open class ChangeFreq: StandardTag {
+    
+    override open class var name: String { .init(ChangeFreq.self) }
     
     public enum Value: String {
         case always
diff --git a/Sources/SwiftSitemap/LastMod.swift b/Sources/SwiftSitemap/LastMod.swift
index cddd79a..cc553ee 100644
--- a/Sources/SwiftSitemap/LastMod.swift
+++ b/Sources/SwiftSitemap/LastMod.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class LastMod: Tag {
-
+open class LastMod: StandardTag {
 
+    override open class var name: String { .init(LastMod.self) }
 }
diff --git a/Sources/SwiftSitemap/Loc.swift b/Sources/SwiftSitemap/Loc.swift
index 460e9bc..29757fa 100644
--- a/Sources/SwiftSitemap/Loc.swift
+++ b/Sources/SwiftSitemap/Loc.swift
@@ -5,6 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class Loc: Tag {
+open class Loc: StandardTag {
     
+    override open class var name: String { .init(Loc.self) }
 }
diff --git a/Sources/SwiftSitemap/Priority.swift b/Sources/SwiftSitemap/Priority.swift
index 5ec9cf3..c84f8a3 100644
--- a/Sources/SwiftSitemap/Priority.swift
+++ b/Sources/SwiftSitemap/Priority.swift
@@ -5,7 +5,9 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class Priority: Tag {
+open class Priority: StandardTag {
+    
+    override open class var name: String { .init(Priority.self) }
 
     public init(_ value: Double) {
         super.init()
diff --git a/Sources/SwiftSitemap/Sitemap.swift b/Sources/SwiftSitemap/Sitemap.swift
index bd4399b..f491d4d 100644
--- a/Sources/SwiftSitemap/Sitemap.swift
+++ b/Sources/SwiftSitemap/Sitemap.swift
@@ -6,6 +6,7 @@
 //
 
 // https://www.sitemaps.org/protocol.html
-open class Sitemap: Tag {
-
+open class Sitemap: StandardTag {
+    
+    override open class var name: String { .init(Sitemap.self) }
 }
diff --git a/Sources/SwiftSitemap/SitemapIndex.swift b/Sources/SwiftSitemap/SitemapIndex.swift
index fa62ad6..78ad84e 100644
--- a/Sources/SwiftSitemap/SitemapIndex.swift
+++ b/Sources/SwiftSitemap/SitemapIndex.swift
@@ -5,10 +5,12 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class SitemapIndex: Tag {
+open class SitemapIndex: StandardTag {
+    
+    override open class var name: String { .init(SitemapIndex.self) }
 
     public init(@TagBuilder _ builder: () -> Tag) {
-        super.init(node: .init(SitemapIndex.self), [builder()])
+        super.init([builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
         ])
diff --git a/Sources/SwiftSitemap/Url.swift b/Sources/SwiftSitemap/Url.swift
index ba84ce2..0c2d963 100644
--- a/Sources/SwiftSitemap/Url.swift
+++ b/Sources/SwiftSitemap/Url.swift
@@ -5,9 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class Url: Tag {
-
-    convenience init() {
-        self.init(node: .init(Url.self))
-    }
+open class Url: StandardTag {
+    
+    override open class var name: String { .init(Url.self) }
 }
diff --git a/Sources/SwiftSitemap/UrlSet.swift b/Sources/SwiftSitemap/UrlSet.swift
index ee76fa5..c9a7c2d 100644
--- a/Sources/SwiftSitemap/UrlSet.swift
+++ b/Sources/SwiftSitemap/UrlSet.swift
@@ -5,10 +5,12 @@
 //  Created by Tibor Bodecs on 2021. 12. 19..
 //
 
-open class UrlSet: Tag {
+open class UrlSet: StandardTag {
+    
+    override open class var name: String { .init(UrlSet.self) }
 
     public init(@TagBuilder _ builder: () -> Tag) {
-        super.init(node: .init(UrlSet.self), [builder()])
+        super.init([builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
         ])
diff --git a/Sources/SwiftSvg/Circle.swift b/Sources/SwiftSvg/Circle.swift
index 437f8f4..cfb3135 100644
--- a/Sources/SwiftSvg/Circle.swift
+++ b/Sources/SwiftSvg/Circle.swift
@@ -6,7 +6,9 @@
 //
 
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/circle
-open class Circle: Tag {
+open class Circle: StandardTag {
+    
+    override open class var name: String { .init(Circle.self) }
 
     public init(cx: Double,
                 cy: Double,
diff --git a/Sources/SwiftSvg/Ellipse.swift b/Sources/SwiftSvg/Ellipse.swift
index 03a47b7..a785269 100644
--- a/Sources/SwiftSvg/Ellipse.swift
+++ b/Sources/SwiftSvg/Ellipse.swift
@@ -6,14 +6,16 @@
 //
 
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/ellipse
-open class Ellipse: Tag {
+open class Ellipse: EmptyTag {
+    
+    override open class var name: String { .init(Ellipse.self) }
 
     public init(cx: Double,
                 cy: Double,
                 rx: Double,
                 ry: Double,
                 pathLength: Double? = nil) {
-        super.init(node: .init(Ellipse.self))
+        super.init()
         setAttributes([
             .init(key: "cx", value: cx.preciseString),
             .init(key: "cy", value: cy.preciseString),
diff --git a/Sources/SwiftSvg/Line.swift b/Sources/SwiftSvg/Line.swift
index a47db1b..09ab205 100644
--- a/Sources/SwiftSvg/Line.swift
+++ b/Sources/SwiftSvg/Line.swift
@@ -6,7 +6,9 @@
 //
 
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/line
-open class Line: Tag {
+open class Line: StandardTag {
+    
+    override open class var name: String { .init(Line.self) }
 
     public init(x1: Double,
                 y1: Double,
diff --git a/Sources/SwiftSvg/Path.swift b/Sources/SwiftSvg/Path.swift
index 853d397..6317cc6 100644
--- a/Sources/SwiftSvg/Path.swift
+++ b/Sources/SwiftSvg/Path.swift
@@ -7,7 +7,9 @@
 
 
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/path
-open class Path: Tag {
+open class Path: StandardTag {
+    
+    override open class var name: String { .init(Path.self) }
 
     public init(_ d: String, pathLength: Double? = nil) {
         super.init()
diff --git a/Sources/SwiftSvg/Polygon.swift b/Sources/SwiftSvg/Polygon.swift
index bcffe80..f8307af 100644
--- a/Sources/SwiftSvg/Polygon.swift
+++ b/Sources/SwiftSvg/Polygon.swift
@@ -6,7 +6,9 @@
 //
 
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/polygon
-open class Polygon: Tag {
+open class Polygon: StandardTag {
+    
+    override open class var name: String { .init(Polygon.self) }
 
     public init(_ points: [Double], pathLength: Double? = nil) {
         super.init()
diff --git a/Sources/SwiftSvg/Polyline.swift b/Sources/SwiftSvg/Polyline.swift
index c5fd362..bf989ce 100644
--- a/Sources/SwiftSvg/Polyline.swift
+++ b/Sources/SwiftSvg/Polyline.swift
@@ -6,7 +6,9 @@
 //
 
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/polyline
-open class Polyline: Tag {
+open class Polyline: StandardTag {
+    
+    override open class var name: String { .init(Polyline.self) }
 
     public init(_ points: [Double], pathLength: Double? = nil) {
         super.init()
diff --git a/Sources/SwiftSvg/Rect.swift b/Sources/SwiftSvg/Rect.swift
index 54ed308..90c4918 100644
--- a/Sources/SwiftSvg/Rect.swift
+++ b/Sources/SwiftSvg/Rect.swift
@@ -6,7 +6,9 @@
 //
 
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/rect
-open class Rect: Tag {
+open class Rect: EmptyTag {
+    
+    override open class var name: String { .init(Rect.self) }
 
     public init(x: Double,
                 y: Double,
@@ -15,7 +17,7 @@ open class Rect: Tag {
                 rx: Double? = nil,
                 ry: Double? = nil,
                 pathLength: Double? = nil) {
-        super.init(node: .init(Rect.self))
+        super.init()
         setAttributes([
             .init(key: "x", value: x.preciseString),
             .init(key: "y", value: y.preciseString),
diff --git a/Sources/SwiftSvg/Svg.swift b/Sources/SwiftSvg/Svg.swift
index 82dece2..8ea0271 100644
--- a/Sources/SwiftSvg/Svg.swift
+++ b/Sources/SwiftSvg/Svg.swift
@@ -6,8 +6,9 @@
 //
 
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element
-open class Svg: Tag {
-
+open class Svg: StandardTag {
+    
+    override open class var name: String { .init(Svg.self) }
 }
 
 public extension Svg {
diff --git a/Tests/SwiftRssTests/SwiftRssTests.swift b/Tests/SwiftRssTests/SwiftRssTests.swift
index 534b838..1589738 100644
--- a/Tests/SwiftRssTests/SwiftRssTests.swift
+++ b/Tests/SwiftRssTests/SwiftRssTests.swift
@@ -41,14 +41,14 @@ final class SwiftRssTests: XCTestCase {
                 <description><![CDATA[ipsum]]></description>
                 <link></link>
                 <language>en_US</language>
-                <lastBuildDate>2021-12-19</lastBuildDate>
-                <pubDate>2021-12-19</pubDate>
+                <lastbuilddate>2021-12-19</lastbuilddate>
+                <pubdate>2021-12-19</pubdate>
                 <ttl>250</ttl>
                 <item>
                     <guid isPermalink="true">http://localhost/</guid>
                     <title><![CDATA[lorem]]></title>
                     <description><![CDATA[ipsum]]></description>
-                    <pubDate>lorem</pubDate>
+                    <pubdate>lorem</pubdate>
                 </item>
             </channel>
         </rss>
diff --git a/Tests/SwiftSgmlTests/CustomTags.swift b/Tests/SwiftSgmlTests/CustomTags.swift
index 5b0a5c0..dc24006 100644
--- a/Tests/SwiftSgmlTests/CustomTags.swift
+++ b/Tests/SwiftSgmlTests/CustomTags.swift
@@ -7,14 +7,14 @@
 
 import SwiftSgml
 
-final class Root: Tag {
+final class Root: StandardTag {
     
 }
 
-final class Leaf: Tag {
+final class Leaf: StandardTag {
     
 }
 
-final class Branch: Tag {
+final class Branch: StandardTag {
     
 }
diff --git a/Tests/SwiftSitemapTests/assert.swift b/Tests/SwiftSitemapTests/assert.swift
index fcb75c4..f21a556 100644
--- a/Tests/SwiftSitemapTests/assert.swift
+++ b/Tests/SwiftSitemapTests/assert.swift
@@ -13,5 +13,6 @@ func assert(doc: Document, html: String) {
     let expectation = html
         .replacingOccurrences(of: "    ", with: "")
         .replacingOccurrences(of: "\n", with: "")
+    print(renderer.render(doc))
     XCTAssertEqual(renderer.render(doc), expectation)
 }

From 4fb00a307d81c2236e04fc8f36044398edeb2146 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 10 Jul 2023 10:10:42 -0400
Subject: [PATCH 028/141] Tweak

---
 Sources/SwiftSgml/Tag.swift | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 13a36aa..61cd846 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -13,23 +13,23 @@ open class Tag {
     // MARK: - init
         
     /// initialize a new Tag with child tags
-    public init(node: Node? = nil, _ children: [Tag] = []) {
-        self.node = node ?? .init()
+    public init(node: Node = .init(), _ children: [Tag] = []) {
+        self.node = node
         self.children = children
     }
 
     /// initialize a new Tag with a single child tag
-    public convenience init(node: Node? = nil, _ child: Tag) {
+    public convenience init(node: Node = .init(), _ child: Tag) {
         self.init(node: node, [child])
     }
 
     /// initialize a new Tag with children using a builder
-    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
+    public convenience init(node: Node = .init(), @TagBuilder _ builder: () -> Tag) {
         self.init(node: node, [builder()])
     }
     
     /// initialize a new Tag with some contents
-    public convenience init(node: Node? = nil, _ contents: String?) {
+    public convenience init(node: Node = .init(), _ contents: String?) {
         self.init(node: node)
         if let contents = contents {
             setContents(contents)

From 542e8f89ccf7c2a86a3af24e6610f9fd0f73a856 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 10 Jul 2023 14:58:39 -0400
Subject: [PATCH 029/141] Node name is required at Tag level

---
 Sources/SwiftSgml/Tag.swift      | 14 +++++++++-----
 Sources/SwiftSgml/TypedTag.swift |  8 +++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 61cd846..48c38bf 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -10,26 +10,30 @@ open class Tag {
     public private(set) var node: Node
     public private(set) var children: [Tag]
     
+    open class var node: Node { .init(type: .standard, name: Self.name) }
+    
+    open class var name: String { .init(self).lowercased() }
+    
     // MARK: - init
         
     /// initialize a new Tag with child tags
-    public init(node: Node = .init(), _ children: [Tag] = []) {
-        self.node = node
+    public init(node: Node? = nil, _ children: [Tag] = []) {
+        self.node = node ?? Self.node
         self.children = children
     }
 
     /// initialize a new Tag with a single child tag
-    public convenience init(node: Node = .init(), _ child: Tag) {
+    public convenience init(node: Node? = nil, _ child: Tag) {
         self.init(node: node, [child])
     }
 
     /// initialize a new Tag with children using a builder
-    public convenience init(node: Node = .init(), @TagBuilder _ builder: () -> Tag) {
+    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
         self.init(node: node, [builder()])
     }
     
     /// initialize a new Tag with some contents
-    public convenience init(node: Node = .init(), _ contents: String?) {
+    public convenience init(node: Node? = nil, _ contents: String?) {
         self.init(node: node)
         if let contents = contents {
             setContents(contents)
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index 803f935..796c3d3 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -9,8 +9,6 @@ open class TypedTag: Tag {
     
     open class var type: Node.NodeType { .standard }
     
-    open class var name: String { .init(self).lowercased() }
-    
     private class func node(name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute] = []) -> Node {
@@ -33,9 +31,9 @@ open class TypedTag: Tag {
     }
     
     public convenience init(name: String? = nil,
-                contents: String? = nil,
-                attributes: [Attribute] = [],
-                @TagBuilder _ builder: () -> Tag) {
+                            contents: String? = nil,
+                            attributes: [Attribute] = [],
+                            @TagBuilder _ builder: () -> Tag) {
         self.init(name: name, contents: contents, attributes: attributes, [builder()])
     }
     

From aeccbc8168b4c97db82607e1a0df75897ad60847 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:04:07 -0400
Subject: [PATCH 030/141] Make Node name non-optional

---
 Sources/SwiftSgml/DocumentRenderer.swift | 4 ++--
 Sources/SwiftSgml/Node.swift             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index 89dbe57..3a41cd5 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -69,11 +69,11 @@ public struct DocumentRenderer {
     }
     
     private func renderOpening(_ tag: Tag) -> String {
-        return "<" + tag.node.name! + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
+        return "<" + tag.node.name + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
     }
     
     private func renderClosing(_ tag: Tag) -> String {
-        "</" + tag.node.name! + ">"
+        "</" + tag.node.name + ">"
     }
 
     private func renderAttributes(_ attributes: [Attribute]) -> String {
diff --git a/Sources/SwiftSgml/Node.swift b/Sources/SwiftSgml/Node.swift
index 00f577e..8094d7d 100644
--- a/Sources/SwiftSgml/Node.swift
+++ b/Sources/SwiftSgml/Node.swift
@@ -21,12 +21,12 @@ public struct Node {
     }
 
     public let type: NodeType
-    public let name: String?
+    public let name: String
     public var contents: String?
     public internal(set) var attributes: [Attribute]
 
     public init(type: NodeType = .standard,
-         name: String? = nil,
+         name: String,
          contents: String? = nil,
          attributes: [Attribute] = []
     ) {

From c06591eaf79e2edf2546d2dc3b864a789bc3a3b0 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:08:10 -0400
Subject: [PATCH 031/141] Update

---
 Sources/SwiftSgml/DocumentRenderer.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index 3a41cd5..3c736ee 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -72,6 +72,7 @@ public struct DocumentRenderer {
         return "<" + tag.node.name + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
     }
     
+    
     private func renderClosing(_ tag: Tag) -> String {
         "</" + tag.node.name + ">"
     }

From 7f69a25a7174caf811d1db4d8cc3b8c5b8270eb4 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:15:10 -0400
Subject: [PATCH 032/141] Testing Tag class name

---
 Sources/SwiftHtml/Tags/Div.swift         | 2 +-
 Sources/SwiftSgml/DocumentRenderer.swift | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index fbeaf70..0a7a4fc 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -16,7 +16,7 @@
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
 open class Div: StandardTag {
     
-    override open class var name: String { .init(Div.self) }
+//    override open class var name: String { .init(Div.self) }
 }
 
 
diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index 3c736ee..3a41cd5 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -72,7 +72,6 @@ public struct DocumentRenderer {
         return "<" + tag.node.name + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
     }
     
-    
     private func renderClosing(_ tag: Tag) -> String {
         "</" + tag.node.name + ">"
     }

From f7a45ae4acd0b92ea6f50c044d4e445bb5e0938f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:19:49 -0400
Subject: [PATCH 033/141] Testing Node name

---
 Sources/SwiftHtml/Tags/Div.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index 0a7a4fc..decb57b 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -17,6 +17,7 @@
 open class Div: StandardTag {
     
 //    override open class var name: String { .init(Div.self) }
+    
 }
 
 

From 63dd73f81eccbae7df1bc4f39ef7e047501e6444 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:22:54 -0400
Subject: [PATCH 034/141] Testing Node name

---
 Sources/SwiftHtml/Tags/Div.swift | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index decb57b..fbeaf70 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -16,8 +16,7 @@
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
 open class Div: StandardTag {
     
-//    override open class var name: String { .init(Div.self) }
-    
+    override open class var name: String { .init(Div.self) }
 }
 
 

From 5ba01c5f6fad37736880ce702ae45ac286ec11ca Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 10 Jul 2023 16:33:32 -0400
Subject: [PATCH 035/141] Minor tweaks

---
 Sources/SwiftRss/LastBuildDate.swift    | 2 +-
 Sources/SwiftRss/PubDate.swift          | 2 +-
 Tests/SwiftRssTests/SwiftRssTests.swift | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftRss/LastBuildDate.swift b/Sources/SwiftRss/LastBuildDate.swift
index b76a67f..8332d8a 100644
--- a/Sources/SwiftRss/LastBuildDate.swift
+++ b/Sources/SwiftRss/LastBuildDate.swift
@@ -8,5 +8,5 @@
 
 open class LastBuildDate: StandardTag {
     
-    override open class var name: String { .init(LastBuildDate.self) }
+    override open class var name: String { "lastBuildDate" }
 }
diff --git a/Sources/SwiftRss/PubDate.swift b/Sources/SwiftRss/PubDate.swift
index eeba3ae..2a9573c 100644
--- a/Sources/SwiftRss/PubDate.swift
+++ b/Sources/SwiftRss/PubDate.swift
@@ -7,5 +7,5 @@
 
 open class PubDate: StandardTag {
     
-    override open class var name: String { .init(PubDate.self) }
+    override open class var name: String { "pubDate" }
 }
diff --git a/Tests/SwiftRssTests/SwiftRssTests.swift b/Tests/SwiftRssTests/SwiftRssTests.swift
index 1589738..534b838 100644
--- a/Tests/SwiftRssTests/SwiftRssTests.swift
+++ b/Tests/SwiftRssTests/SwiftRssTests.swift
@@ -41,14 +41,14 @@ final class SwiftRssTests: XCTestCase {
                 <description><![CDATA[ipsum]]></description>
                 <link></link>
                 <language>en_US</language>
-                <lastbuilddate>2021-12-19</lastbuilddate>
-                <pubdate>2021-12-19</pubdate>
+                <lastBuildDate>2021-12-19</lastBuildDate>
+                <pubDate>2021-12-19</pubDate>
                 <ttl>250</ttl>
                 <item>
                     <guid isPermalink="true">http://localhost/</guid>
                     <title><![CDATA[lorem]]></title>
                     <description><![CDATA[ipsum]]></description>
-                    <pubdate>lorem</pubdate>
+                    <pubDate>lorem</pubDate>
                 </item>
             </channel>
         </rss>

From cba89d07221a10330f2a668e46e9a909dc725eb1 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 07:03:31 -0400
Subject: [PATCH 036/141] Little tweaks

---
 Sources/SwiftHtml/Tags/Comment.swift |  4 +---
 Sources/SwiftSgml/CommentTag.swift   | 11 +++++++++++
 Sources/SwiftSgml/Tag.swift          | 13 +++++++++++++
 Sources/SwiftSgml/TypedTag.swift     |  9 +++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 Sources/SwiftSgml/CommentTag.swift

diff --git a/Sources/SwiftHtml/Tags/Comment.swift b/Sources/SwiftHtml/Tags/Comment.swift
index 61154c4..a44eeeb 100644
--- a/Sources/SwiftHtml/Tags/Comment.swift
+++ b/Sources/SwiftHtml/Tags/Comment.swift
@@ -12,9 +12,7 @@
 /// Comments are not displayed in the browsers.
 /// You can use comments to explain your code, which can help you when you edit the source code at a later date.
 /// This is especially useful if you have a lot of code.
-open class Comment: TypedTag {
-    
-    override open class var type: Node.NodeType { .comment }
+open class Comment: CommentTag {
     
     override open class var name: String { .init(Comment.self) }
     
diff --git a/Sources/SwiftSgml/CommentTag.swift b/Sources/SwiftSgml/CommentTag.swift
new file mode 100644
index 0000000..a8940fd
--- /dev/null
+++ b/Sources/SwiftSgml/CommentTag.swift
@@ -0,0 +1,11 @@
+//
+//  CommentTag.swift
+//  
+//
+//  Created by Brad Gourley on 7/11/23.
+//
+
+open class CommentTag: TypedTag {
+        
+    override open class var type: Node.NodeType { .comment }
+}
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 48c38bf..ae22cff 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -5,6 +5,19 @@
 //  Created by Tibor Bodecs on 2021. 11. 19..
 //
 
+//  There are three ways to use this class...
+//
+//  1- init(...) with a custom Node. It will render according to the type, name, etc. supplied.
+//
+//  2— Subclass and override `class var node: Node`. It will render with the type, name, etc. supplied.
+//
+//  3— Just subclass. It will render an opening and closing tag with the name of your subclass lowercased. <classname></classname>
+//
+//  Simple subclasses that render with an open and close tag can just override `class var name: String`. <customName></customName>
+//
+//  For common HTML tags like Div, P, A, etc. use one of the pre-made subclasses elsewhere in the library.
+
+
 open class Tag {
         
     public private(set) var node: Node
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index 796c3d3..8ccb577 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -5,6 +5,15 @@
 //  Created by Brad Gourley on 7/10/23.
 //
 
+//  Base class for all tags with a particular node type.
+//
+//  In most cases, it is more appropriate to subclass the parent class Tag
+//
+//  or one of the superclasses: StandardTag, GroupTag, EmptyTag, CommentTag.
+//
+//  Subclasses only need to override the 'type' var
+
+
 open class TypedTag: Tag {
     
     open class var type: Node.NodeType { .standard }

From 7e13acaf9167d6f90c3c202dd673abd3b1d49913 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 07:59:37 -0400
Subject: [PATCH 037/141] Updated to fit code changes

---
 README.md | 77 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 66 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 54eecd3..6783612 100644
--- a/README.md
+++ b/README.md
@@ -74,35 +74,51 @@ That's it.
 
 ## Creating custom tags
 
-You can define your own custom tags by subclassing the `Tag` or `EmptyTag` class. 
+You can define your own custom tags a few different ways, from most simple to complex cases.
 
-You can follow the same pattern if you take a look at the core tags.
+1. Just subclass `Tag` and it will render with your class name lowercased.
 
 ```swift
-open class Div: Tag {
+class MyTag: Tag { }
 
+// renders <mytag></mytag>
+```
+
+2. Subclass `Tag` and override the `name` property.
+
+```swift
+class MyTag: Tag { 
+
+    override open class var name: String { "myTag" }
 }
 
-// <div></div> - standard tag
+// renders <myTag></myTag>
+```
+
+3. Subclass `Tag` and override the `node` property. The `Node` determines how your class will render. For example, to create an empty tag...
 
-open class Br: EmptyTag {
+```swift
+class MyTag: Tag {
     
+    override open class var node: Node { .init(type: .empty, name: "myTag") }
 }
-// <br> - no closing tag
 
+// renders <myTag>
 ```
 
-By default the name of the tag is automatically derived from the class name (lowercased), but you can also create your own tag type & name by overriding the `createNode()` class function.
+4. Subclass, create your own custom initializer and then call the `Tag` designated initializer.
 
 ```swift
-open class LastBuildDate: Tag {
+class MyTag: Tag {
 
-    open override class func createNode() -> Node {
-        Node(type: .standard, name: "lastBuildDate")
+    init(myAttributeValue: String, @TagBuilder _ builder: () -> Tag) {
+        let attribute = .init(key: "myKey", value: myAttributeValue)
+        let node = Node(type: .empty, name: "myTag", [attribute])
+        super.init(node: node, [builder()])
     }
 }
 
-// <lastBuildDate></lastBuildDate> - standard tag with custom name
+// renders <myTag myKey="myAttributeValue">
 ```
 
 It is also possible to create tags with altered content or default attributes.
@@ -129,6 +145,45 @@ open class Rss: Tag {
 // <rss version="2.0">...</rss> - tag with a default attribute
 ```
 
+
+To customize tags of a particular type...
+
+```html
+<standard></standard>
+<empty>
+<!-- comment -->
+```
+
+...use the `TypedTag` classes: `StandardTag`, `EmptyTag` and `CommentTag`
+
+
+If you get into coding situations where tags need to be combined without the container rendering, use the `GroupTag`. This class is especially handy when the function calls for a single `Tag` and you want to supply many.
+
+```swift
+class MyTag: Tag {
+
+    init(myAttributeValue: String, @TagBuilder _ builder: () -> Tag) {
+        let attribute = .init(key: "myKey", value: myAttributeValue)
+        let node = Node(type: .empty, name: "myTag", [attribute])
+        super.init(node: node, [builder()])
+    }
+    
+    convenience init(anotherValue: String) {
+        self.init(myAttributeValue: anotherValue) {
+            // must return one Tag for builder parameter
+            // use GroupTag because it will not render 
+            GroupTag {
+                Tag()
+                Tag()
+                Tag()
+            }
+        }
+    }
+}
+```
+
+And if you just need to render standard HTML — `<div>`, `<p>`, `<a>`, etc. — use one the pre-made classes in the library.
+
 ## Attribute management
 
 You can set, add or delete the attributes of a given tag.

From 1f1f8ceff0b7ed6d6006e373e1978e27f547b7a1 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 08:01:06 -0400
Subject: [PATCH 038/141] Fixes

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6783612..3367130 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ You can define your own custom tags a few different ways, from most simple to co
 ```swift
 class MyTag: Tag { }
 
-// renders <mytag></mytag>
+// <mytag></mytag>
 ```
 
 2. Subclass `Tag` and override the `name` property.
@@ -92,7 +92,7 @@ class MyTag: Tag {
     override open class var name: String { "myTag" }
 }
 
-// renders <myTag></myTag>
+// <myTag></myTag>
 ```
 
 3. Subclass `Tag` and override the `node` property. The `Node` determines how your class will render. For example, to create an empty tag...
@@ -103,7 +103,7 @@ class MyTag: Tag {
     override open class var node: Node { .init(type: .empty, name: "myTag") }
 }
 
-// renders <myTag>
+// <myTag>
 ```
 
 4. Subclass, create your own custom initializer and then call the `Tag` designated initializer.
@@ -118,7 +118,7 @@ class MyTag: Tag {
     }
 }
 
-// renders <myTag myKey="myAttributeValue">
+// <myTag myKey="myAttributeValue">
 ```
 
 It is also possible to create tags with altered content or default attributes.

From d35f3ad83d732c2ce907763fb49e5be99e627583 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 08:02:44 -0400
Subject: [PATCH 039/141] Typos

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3367130..0daa3e1 100644
--- a/README.md
+++ b/README.md
@@ -164,7 +164,7 @@ class MyTag: Tag {
 
     init(myAttributeValue: String, @TagBuilder _ builder: () -> Tag) {
         let attribute = .init(key: "myKey", value: myAttributeValue)
-        let node = Node(type: .empty, name: "myTag", [attribute])
+        let node = Node(type: .empty, name: "myTag", attributes: [attribute])
         super.init(node: node, [builder()])
     }
     

From 6004035d405997cefbe19a697c04dec0a8e09ae7 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 08:03:57 -0400
Subject: [PATCH 040/141] Typos

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0daa3e1..c98c97a 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ class MyTag: Tag {
 
     init(myAttributeValue: String, @TagBuilder _ builder: () -> Tag) {
         let attribute = .init(key: "myKey", value: myAttributeValue)
-        let node = Node(type: .empty, name: "myTag", [attribute])
+        let node = Node(type: .empty, name: "myTag", attributes: [attribute])
         super.init(node: node, [builder()])
     }
 }

From a71b92a53f93325c5c5736a89c8606044548ea93 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:10:23 -0400
Subject: [PATCH 041/141] TagRepresentable protocol

---
 README.md                                 |  10 ++
 Sources/SwiftHtml/Attributes/Events.swift | 142 +++++++++++-----------
 Sources/SwiftHtml/Attributes/Global.swift |  32 ++---
 Sources/SwiftHtml/Tags/Map.swift          |   2 +-
 Sources/SwiftRss/Rss.swift                |   2 +-
 Sources/SwiftSgml/CommentTag.swift        |   2 +-
 Sources/SwiftSgml/Document.swift          |   4 +-
 Sources/SwiftSgml/DocumentRenderer.swift  |   8 +-
 Sources/SwiftSgml/Tag.swift               |  64 ++++++++--
 Sources/SwiftSgml/TagBuilder.swift        |  14 +--
 Sources/SwiftSgml/TypedTag.swift          |  14 +--
 Sources/SwiftSitemap/SitemapIndex.swift   |   2 +-
 Sources/SwiftSitemap/UrlSet.swift         |   2 +-
 Tests/SwiftHtmlTests/SwiftHtmlTests.swift |   2 +-
 14 files changed, 170 insertions(+), 130 deletions(-)

diff --git a/README.md b/README.md
index c98c97a..ad08656 100644
--- a/README.md
+++ b/README.md
@@ -121,6 +121,16 @@ class MyTag: Tag {
 // <myTag myKey="myAttributeValue">
 ```
 
+5. Implement the `TagRepresentable` protocol in your own class. It is very simple, can be customized with an extension, and allows any class to render as nested tags.
+
+```swift
+class MyClass { }
+
+extension MyClass: TagRepresentable {
+    ... implement protocol requirements
+}
+```
+
 It is also possible to create tags with altered content or default attributes.
 
 ```swift
diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 28758d5..3cc807f 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -5,135 +5,135 @@
 //  Created by Tibor Bodecs on 2021. 07. 23..
 //
 
-public extension Tag {
+public extension TagRepresentable {
     
     // MARK: - Window Event Attributes
     
     /// Script to be run after the document is printed
     func onAfterPrint(_ value: String) -> Self {
-        attribute("onafterprint", value)
+        attribute("onafterprint", value, true)
     }
     
     /// Script to be run before the document is printed
     func onBeforePrint(_ value: String) -> Self {
-        attribute("onbeforeprint", value)
+        attribute("onbeforeprint", value, true)
     }
     
     /// Script to be run when the document is about to be unloaded
     func onBeforeUnload(_ value: String) -> Self {
-        attribute("onbeforeunload", value)
+        attribute("onbeforeunload", value, true)
     }
     
     /// Script to be run when an error occurs
     func onError(_ value: String) -> Self {
-        attribute("onerror", value)
+        attribute("onerror", value, true)
     }
     
     /// Script to be run when there has been changes to the anchor part of the a URL
     func onHashChange(_ value: String) -> Self {
-        attribute("onhashchange", value)
+        attribute("onhashchange", value, true)
     }
     
     /// Fires after the page is finished loading
     func onLoad(_ value: String) -> Self {
-        attribute("onload", value)
+        attribute("onload", value, true)
     }
     
     /// Script to be run when the message is triggered
     func onMessage(_ value: String) -> Self {
-        attribute("onmessage", value)
+        attribute("onmessage", value, true)
     }
     
     /// Script to be run when the browser starts to work offline
     func onOffline(_ value: String) -> Self {
-        attribute("onoffline", value)
+        attribute("onoffline", value, true)
     }
     
     /// Script to be run when the browser starts to work online
     func onOnline(_ value: String) -> Self {
-        attribute("ononline", value)
+        attribute("ononline", value, true)
     }
     
     /// Script to be run when a user navigates away from a page
     func onPageHide(_ value: String) -> Self {
-        attribute("onpagehide", value)
+        attribute("onpagehide", value, true)
     }
     
     /// Script to be run when a user navigates to a page
     func onPageShow(_ value: String) -> Self {
-        attribute("onpageshow", value)
+        attribute("onpageshow", value, true)
     }
     
     /// Script to be run when the window's history changes
     func onPopState(_ value: String) -> Self {
-        attribute("onpopstate", value)
+        attribute("onpopstate", value, true)
     }
     
     /// Fires when the browser window is resized
     func onResize(_ value: String) -> Self {
-        attribute("onresize", value)
+        attribute("onresize", value, true)
     }
     
     /// Script to be run when a Web Storage area is updated
     func onStorage(_ value: String) -> Self {
-        attribute("onstorage", value)
+        attribute("onstorage", value, true)
     }
     
     /// Fires once a page has unloaded (or the browser window has been closed)
     func onUnload(_ value: String) -> Self {
-        attribute("onunload", value)
+        attribute("onunload", value, true)
     }
     
     // MARK: - Form Events
     
     /// Fires the moment that the element loses focus
     func onBlur(_ value: String) -> Self {
-        attribute("onblur", value)
+        attribute("onblur", value, true)
     }
 
     /// Fires the moment when the value of the element is changed
     func onChange(_ value: String) -> Self {
-        attribute("onchange", value)
+        attribute("onchange", value, true)
     }
 
     /// Script to be run when a context menu is triggered
     func onContextMenu(_ value: String) -> Self {
-        attribute("oncontextmenu", value)
+        attribute("oncontextmenu", value, true)
     }
 
     /// Fires the moment when the element gets focus
     func onFocus(_ value: String) -> Self {
-        attribute("onfocus", value)
+        attribute("onfocus", value, true)
     }
 
     /// Script to be run when an element gets user input
     func onInput(_ value: String) -> Self {
-        attribute("oninput", value)
+        attribute("oninput", value, true)
     }
 
     /// Script to be run when an element is invalid
     func onInvalid(_ value: String) -> Self {
-        attribute("oninvalid", value)
+        attribute("oninvalid", value, true)
     }
 
     /// Fires when the Reset button in a form is clicked
     func onReset(_ value: String) -> Self {
-        attribute("onreset", value)
+        attribute("onreset", value, true)
     }
 
     /// Fires when the user writes something in a search field (for <input="search">)
     func onSearch(_ value: String) -> Self {
-        attribute("onsearch", value)
+        attribute("onsearch", value, true)
     }
 
     /// Fires after some text has been selected in an element
     func onSelect(_ value: String) -> Self {
-        attribute("onselect", value)
+        attribute("onselect", value, true)
     }
 
     /// Fires when a form is submitted
     func onSubmit(_ value: String) -> Self {
-        attribute("onsubmit", value)
+        attribute("onsubmit", value, true)
     }
     
     // MARK: - Keyboard Events
@@ -141,17 +141,17 @@ public extension Tag {
 
     /// Fires when a user is pressing a key
     func onKeyDown(_ value: String) -> Self {
-        attribute("onkeydown", value)
+        attribute("onkeydown", value, true)
     }
 
     /// Fires when a user presses a key
     func onKeyPress(_ value: String) -> Self {
-        attribute("onkeypress", value)
+        attribute("onkeypress", value, true)
     }
 
     /// Fires when a user releases a key
     func onKeyUp(_ value: String) -> Self {
-        attribute("onkeyup", value)
+        attribute("onkeyup", value, true)
     }
     
     // MARK: - Mouse Events
@@ -159,138 +159,138 @@ public extension Tag {
 
     /// Fires on a mouse click on the element
     func onClick(_ value: String) -> Self {
-        attribute("onclick", value)
+        attribute("onclick", value, true)
     }
 
     /// Fires on a mouse double-click on the element
     func onDoubleClick(_ value: String) -> Self {
-        attribute("ondblclick", value)
+        attribute("ondblclick", value, true)
     }
 
     /// Fires when a mouse button is pressed down on an element
     func onMouseDown(_ value: String) -> Self {
-        attribute("onmousedown", value)
+        attribute("onmousedown", value, true)
     }
 
     /// Fires when the mouse pointer is moving while it is over an element
     func onMouseMove(_ value: String) -> Self {
-        attribute("onmousemove", value)
+        attribute("onmousemove", value, true)
     }
 
     /// Fires when the mouse pointer moves out of an element
     func onMouseOut(_ value: String) -> Self {
-        attribute("onmouseout", value)
+        attribute("onmouseout", value, true)
     }
 
     /// Fires when the mouse pointer moves over an element
     func onMouseOver(_ value: String) -> Self {
-        attribute("onmouseover", value)
+        attribute("onmouseover", value, true)
     }
 
     /// Fires when a mouse button is released over an element
     func onMouseUp(_ value: String) -> Self {
-        attribute("onmouseup", value)
+        attribute("onmouseup", value, true)
     }
 
     /// Fires when the mouse wheel rolls up or down over an element
     func onWheel(_ value: String) -> Self {
-        attribute("onwheel", value)
+        attribute("onwheel", value, true)
     }
     
     // MARK: - Drag Events
 
     /// Script to be run when an element is dragged
     func onDrag(_ value: String) -> Self {
-        attribute("ondrag", value)
+        attribute("ondrag", value, true)
     }
 
     /// Script to be run at the end of a drag operation
     func onDragEnd(_ value: String) -> Self {
-        attribute("ondragend", value)
+        attribute("ondragend", value, true)
     }
 
     /// Script to be run when an element has been dragged to a valid drop target
     func onDragEnter(_ value: String) -> Self {
-        attribute("ondragenter", value)
+        attribute("ondragenter", value, true)
     }
 
     /// Script to be run when an element leaves a valid drop target
     func onDragLeave(_ value: String) -> Self {
-        attribute("ondragleave", value)
+        attribute("ondragleave", value, true)
     }
 
     /// Script to be run when an element is being dragged over a valid drop target
     func onDragOver(_ value: String) -> Self {
-        attribute("ondragover", value)
+        attribute("ondragover", value, true)
     }
 
     /// Script to be run at the start of a drag operation
     func onDragStart(_ value: String) -> Self {
-        attribute("ondragstart", value)
+        attribute("ondragstart", value, true)
     }
 
     /// Script to be run when dragged element is being dropped
     func onDrop(_ value: String) -> Self {
-        attribute("ondrop", value)
+        attribute("ondrop", value, true)
     }
 
     /// Script to be run when an element's scrollbar is being scrolled
     func onScroll(_ value: String) -> Self {
-        attribute("onscroll", value)
+        attribute("onscroll", value, true)
     }
     
     // MARK: - Clipboard Events
 
     /// Fires when the user copies the content of an element
     func onCopy(_ value: String) -> Self {
-        attribute("oncopy", value)
+        attribute("oncopy", value, true)
     }
 
     /// Fires when the user cuts the content of an element
     func onCut(_ value: String) -> Self {
-        attribute("oncut", value)
+        attribute("oncut", value, true)
     }
 
     /// Fires when the user pastes some content in an element
     func onPaste(_ value: String) -> Self {
-        attribute("onpaste", value)
+        attribute("onpaste", value, true)
     }
     
     // MARK: - Media Events
     
     /// Script to be run on abort
     func onAbort(_ value: String) -> Self {
-        attribute("onabort", value)
+        attribute("onabort", value, true)
     }
 
     /// Script to be run when a file is ready to start playing (when it has buffered enough to begin)
     func onCanPlay(_ value: String) -> Self {
-        attribute("oncanplay", value)
+        attribute("oncanplay", value, true)
     }
 
     /// Script to be run when a file can be played all the way to the end without pausing for buffering
     func onCanPlaythrough(_ value: String) -> Self {
-        attribute("oncanplaythrough", value)
+        attribute("oncanplaythrough", value, true)
     }
 
     /// Script to be run when the cue changes in a <track> element
     func onCueChange(_ value: String) -> Self {
-        attribute("oncuechange", value)
+        attribute("oncuechange", value, true)
     }
 
     /// Script to be run when the length of the media changes
     func onDurationChange(_ value: String) -> Self {
-        attribute("ondurationchange", value)
+        attribute("ondurationchange", value, true)
     }
 
     /// Script to be run when something bad happens and the file is suddenly unavailable (like unexpectedly disconnects)
     func onEmptied(_ value: String) -> Self {
-        attribute("onemptied", value)
+        attribute("onemptied", value, true)
     }
 
     /// Script to be run when the media has reach the end (a useful event for messages like "thanks for listening")
     func onEnded(_ value: String) -> Self {
-        attribute("onended", value)
+        attribute("onended", value, true)
     }
 
     /// Script to be run when an error occurs when the file is being loaded
@@ -300,83 +300,83 @@ public extension Tag {
 
     /// Script to be run when media data is loaded
     func onLoadedData(_ value: String) -> Self {
-        attribute("onloadeddata", value)
+        attribute("onloadeddata", value, true)
     }
 
     /// Script to be run when meta data (like dimensions and duration) are loaded
     func onLoadedMetadata(_ value: String) -> Self {
-        attribute("onloadedmetadata", value)
+        attribute("onloadedmetadata", value, true)
     }
 
     /// Script to be run just as the file begins to load before anything is actually loaded
     func onLoadStart(_ value: String) -> Self {
-        attribute("onloadstart", value)
+        attribute("onloadstart", value, true)
     }
 
     /// Script to be run when the media is paused either by the user or programmatically
     func onPause(_ value: String) -> Self {
-        attribute("onpause", value)
+        attribute("onpause", value, true)
     }
 
     /// Script to be run when the media is ready to start playing
     func onPlay(_ value: String) -> Self {
-        attribute("onplay", value)
+        attribute("onplay", value, true)
     }
 
     /// Script to be run when the media actually has started playing
     func onPlaying(_ value: String) -> Self {
-        attribute("onplaying", value)
+        attribute("onplaying", value, true)
     }
 
     /// Script to be run when the browser is in the process of getting the media data
     func onProgress(_ value: String) -> Self {
-        attribute("onprogress", value)
+        attribute("onprogress", value, true)
     }
 
     /// Script to be run each time the playback rate changes (like when a user switches to a slow motion or fast forward mode)
     func onRateChange(_ value: String) -> Self {
-        attribute("onratechange", value)
+        attribute("onratechange", value, true)
     }
 
     /// Script to be run when the seeking attribute is set to false indicating that seeking has ended
     func onSeeked(_ value: String) -> Self {
-        attribute("onseeked", value)
+        attribute("onseeked", value, true)
     }
 
     /// Script to be run when the seeking attribute is set to true indicating that seeking is active
     func onSeeking(_ value: String) -> Self {
-        attribute("onseeking", value)
+        attribute("onseeking", value, true)
     }
 
     /// Script to be run when the browser is unable to fetch the media data for whatever reason
     func onStalled(_ value: String) -> Self {
-        attribute("onstalled", value)
+        attribute("onstalled", value, true)
     }
 
     /// Script to be run when fetching the media data is stopped before it is completely loaded for whatever reason
     func onSuspend(_ value: String) -> Self {
-        attribute("onsuspend", value)
+        attribute("onsuspend", value, true)
     }
 
     /// Script to be run when the playing position has changed (like when the user fast forwards to a different point in the media)
     func onTimeUpdate(_ value: String) -> Self {
-        attribute("ontimeupdate", value)
+        attribute("ontimeupdate", value, true)
     }
 
     /// Script to be run each time the volume is changed which (includes setting the volume to "mute")
     func onVolumeChange(_ value: String) -> Self {
-        attribute("onvolumechange", value)
+        attribute("onvolumechange", value, true)
     }
 
     /// Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
     func onWaiting(_ value: String) -> Self {
-        attribute("onwaiting", value)
+        attribute("onwaiting", value, true)
     }
     
     // MARK: - Misc Events
     
     /// Fires when the user opens or closes the <details> element
     func onToggle(_ value: String) -> Self {
-        attribute("ontoggle", value)
+        attribute("ontoggle", value, true)
     }
 }
diff --git a/Sources/SwiftHtml/Attributes/Global.swift b/Sources/SwiftHtml/Attributes/Global.swift
index b1c5526..3457114 100644
--- a/Sources/SwiftHtml/Attributes/Global.swift
+++ b/Sources/SwiftHtml/Attributes/Global.swift
@@ -55,7 +55,7 @@ private extension Array where Element == String {
     }
 }
 
-public extension Tag {
+public extension TagRepresentable {
         
     // MARK: - class management
 
@@ -117,7 +117,7 @@ public extension Tag {
     func `class`(remove values: [String], _ condition: Bool = true) -> Self {
         let newClasses = classArray.filter { !values.contains($0) }
         if newClasses.isEmpty {
-            return deleteAttribute("class")
+            return deleteAttribute("class", condition)
         }
         return `class`(newClasses, condition)
     }
@@ -194,7 +194,7 @@ public extension Tag {
     func style(remove values: [String], _ condition: Bool = true) -> Self {
         let newClasses = styleArray.filter { !values.contains($0) }
         if newClasses.isEmpty {
-            return deleteAttribute("style")
+            return deleteAttribute("style", condition)
         }
         return style(newClasses, condition)
     }
@@ -214,7 +214,7 @@ public extension Tag {
     func style(removeByKey values: [String], _ condition: Bool = true) -> Self {
         let newClasses = styleArray.filter { !values.contains(String($0.prefix(while: {$0 != ":"}))) }
         if newClasses.isEmpty {
-            return deleteAttribute("style")
+            return deleteAttribute("style", condition)
         }
         return style(newClasses, condition)
     }
@@ -235,61 +235,61 @@ public extension Tag {
     
     /// Specifies a shortcut key to activate/focus an element
     func accesskey(_ value: Character) -> Self {
-        attribute("accesskey", String(value))
+        attribute("accesskey", String(value), true)
     }
     
     /// Specifies whether the content of an element is editable or not
     func contenteditable(_ value: Bool) -> Self {
-        attribute("contenteditable", String(value))
+        attribute("contenteditable", String(value), true)
     }
     
     /// Used to store custom data private to the page or application
     func data(key: String, _ value: String) -> Self {
-        attribute("data-" + key, value)
+        attribute("data-" + key, value, true)
     }
 
     /// Specifies the text direction for the content in an element
     func dir(_ value: TextDirection = .ltr) -> Self {
-        attribute("dir", value.rawValue)
+        attribute("dir", value.rawValue, true)
     }
     
     /// Specifies whether an element is draggable or not
     func draggable(_ value: Draggable = .auto) -> Self {
-        attribute("draggable", value.rawValue)
+        attribute("draggable", value.rawValue, true)
     }
     
     /// Specifies that an element is not yet, or is no longer, relevant
     func hidden(_ value: Bool? = nil) -> Self {
-        attribute("hidden", value?.description)
+        attribute("hidden", value?.description, true)
     }
     
     /// Specifies a unique id for an element
     func `id`(_ value: String) -> Self {
-        attribute("id", value)
+        attribute("id", value, true)
     }
     
     /// Specifies the language of the element's content
     func lang(_ value: String) -> Self {
-        attribute("lang", value)
+        attribute("lang", value, true)
     }
     
     /// Specifies whether the element is to have its spelling and grammar checked or not
     func spellcheck(_ value: Bool) -> Self {
-        attribute("spellcheck", String(value))
+        attribute("spellcheck", String(value), true)
     }
     
     /// Specifies the tabbing order of an element
     func tabindex(_ value: Int) -> Self {
-        attribute("tabindex", String(value))
+        attribute("tabindex", String(value), true)
     }
     
     /// Specifies extra information about an element
     func title(_ value: String) -> Self {
-        attribute("title", value)
+        attribute("title", value, true)
     }
     
     /// Specifies whether the content of an element should be translated or not
     func translate(_ value: Translate) -> Self {
-        attribute("translate", value.rawValue)
+        attribute("translate", value.rawValue, true)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index 8aa8483..4a0a137 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -14,7 +14,7 @@ open class Map: StandardTag {
     
     override open class var name: String { .init(Map.self) }
         
-    public init(name: String, @TagBuilder _ builder: () -> Tag) {
+    public init(name: String, @TagBuilder _ builder: () -> TagRepresentable) {
         super.init([builder()])
         setAttributes([
             .init(key: "name", value: name)
diff --git a/Sources/SwiftRss/Rss.swift b/Sources/SwiftRss/Rss.swift
index 67770da..9573a8b 100644
--- a/Sources/SwiftRss/Rss.swift
+++ b/Sources/SwiftRss/Rss.swift
@@ -10,7 +10,7 @@ open class Rss: StandardTag {
     
     override open class var name: String { .init(Rss.self) }
     
-    public init(@TagBuilder _ builder: () -> Tag) {
+    public init(@TagBuilder _ builder: () -> TagRepresentable) {
         super.init([builder()])
         setAttributes([
             .init(key: "version", value: "2.0"),
diff --git a/Sources/SwiftSgml/CommentTag.swift b/Sources/SwiftSgml/CommentTag.swift
index a8940fd..61a6057 100644
--- a/Sources/SwiftSgml/CommentTag.swift
+++ b/Sources/SwiftSgml/CommentTag.swift
@@ -7,5 +7,5 @@
 
 open class CommentTag: TypedTag {
         
-    override open class var type: Node.NodeType { .comment }
+    override open class var type: Node.NodeType { .comment }    
 }
diff --git a/Sources/SwiftSgml/Document.swift b/Sources/SwiftSgml/Document.swift
index cd564f8..affa090 100644
--- a/Sources/SwiftSgml/Document.swift
+++ b/Sources/SwiftSgml/Document.swift
@@ -15,9 +15,9 @@ public struct Document {
     }
 
     public let type: `Type`
-    public let root: Tag
+    public let root: TagRepresentable
     
-    public init(_ type: `Type` = .unspecified, @TagBuilder _ builder: () -> Tag) {
+    public init(_ type: `Type` = .unspecified, @TagBuilder _ builder: () -> TagRepresentable) {
         self.type = type
         self.root = builder()
     }
diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index 3a41cd5..0e4a83d 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -36,7 +36,7 @@ public struct DocumentRenderer {
         }
     }
 
-    private func render(tag: Tag, level: Int = 0) -> String {
+    private func render(tag: TagRepresentable, level: Int = 0) -> String {
         let spaces = String(repeating: " ", count: level * indent)
         switch tag.node.type {
         case .standard:
@@ -54,7 +54,7 @@ public struct DocumentRenderer {
         }
     }
     
-    private func renderChildren(_ tag: Tag, level: Int, spaces: String, isGrouped: Bool = false) -> String {
+    private func renderChildren(_ tag: TagRepresentable, level: Int, spaces: String, isGrouped: Bool = false) -> String {
         var newLevel = level + 1
         if isGrouped {
             newLevel = level
@@ -68,11 +68,11 @@ public struct DocumentRenderer {
         return children
     }
     
-    private func renderOpening(_ tag: Tag) -> String {
+    private func renderOpening(_ tag: TagRepresentable) -> String {
         return "<" + tag.node.name + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
     }
     
-    private func renderClosing(_ tag: Tag) -> String {
+    private func renderClosing(_ tag: TagRepresentable) -> String {
         "</" + tag.node.name + ">"
     }
 
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index ae22cff..6a5bfd4 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -5,23 +5,53 @@
 //  Created by Tibor Bodecs on 2021. 11. 19..
 //
 
-//  There are three ways to use this class...
+// This is the base protocol for tags.
 //
-//  1- init(...) with a custom Node. It will render according to the type, name, etc. supplied.
+//  Implement it in your own classes to render them.
 //
-//  2— Subclass and override `class var node: Node`. It will render with the type, name, etc. supplied.
+//  Or use the pre-made class called `Tag`.
 //
-//  3— Just subclass. It will render an opening and closing tag with the name of your subclass lowercased. <classname></classname>
-//
-//  Simple subclasses that render with an open and close tag can just override `class var name: String`. <customName></customName>
-//
-//  For common HTML tags like Div, P, A, etc. use one of the pre-made subclasses elsewhere in the library.
+//  Extend it to customize for your needs.
+
+public protocol TagRepresentable {
+    
+    var node: Node { get }
+    var children: [TagRepresentable] { get }
+    
+    @discardableResult
+    func setContents(_ value: String?, _ condition: Bool) -> Self
+
+    // MARK: - attributes
+    
+    /// set attributes
+    @discardableResult
+    func setAttributes(_ attributes: [Attribute], _ condition: Bool) -> Self
+    
+    /// delete an attribute by a given key
+    @discardableResult
+    func deleteAttribute(_ key: String, _ condition: Bool) -> Self
+    
+    /// add a new attribute with a given value if the condition is true
+    @discardableResult
+    func attribute(_ key: String, _ value: String?, _ condition: Bool) -> Self
 
+    /// add a new flag-like attribute with a given value if the condition is true
+    ///
+    /// if the flag value is `nil` only the attribute key will be used. eg. `<foo bar></foo>`
+    ///
+    @discardableResult
+    func flagAttribute(_ key: String, _ value: String?, _ condition: Bool) -> Self
+}
 
-open class Tag {
+
+//  This is a basic implementation of the TagRepresentable protocol.
+//
+//  See README.md for detailed options on how to use the class.
+
+open class Tag: TagRepresentable {
         
     public private(set) var node: Node
-    public private(set) var children: [Tag]
+    public private(set) var children: [TagRepresentable]
     
     open class var node: Node { .init(type: .standard, name: Self.name) }
     
@@ -30,18 +60,18 @@ open class Tag {
     // MARK: - init
         
     /// initialize a new Tag with child tags
-    public init(node: Node? = nil, _ children: [Tag] = []) {
+    public init(node: Node? = nil, _ children: [TagRepresentable] = []) {
         self.node = node ?? Self.node
         self.children = children
     }
 
     /// initialize a new Tag with a single child tag
-    public convenience init(node: Node? = nil, _ child: Tag) {
+    public convenience init(node: Node? = nil, _ child: TagRepresentable) {
         self.init(node: node, [child])
     }
 
     /// initialize a new Tag with children using a builder
-    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
+    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> TagRepresentable) {
         self.init(node: node, [builder()])
     }
     
@@ -105,3 +135,11 @@ open class Tag {
         return self
     }
 }
+
+public extension String {
+    
+    /// convert class names into node names
+    init(_ `class`: AnyClass) {
+        self.init(stringLiteral: .init(describing: `class`.self).lowercased())
+    }
+}
diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index 60f7ef7..7fb8e31 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -9,31 +9,31 @@
 @resultBuilder
 public enum TagBuilder {
     
-    public static func buildBlock() -> Tag {
+    public static func buildBlock() -> TagRepresentable {
         GroupTag()
     }
     
-    public static func buildBlock(_ components: [Tag]...) -> Tag {
+    public static func buildBlock(_ components: [TagRepresentable]...) -> TagRepresentable {
         GroupTag(components.flatMap { $0 })
     }
     
-    public static func buildBlock(_ components: Tag...) -> Tag {
+    public static func buildBlock(_ components: TagRepresentable...) -> TagRepresentable {
         GroupTag(components)
     }
     
-    public static func buildOptional(_ component: Tag?) -> Tag {
+    public static func buildOptional(_ component: TagRepresentable?) -> TagRepresentable {
         component ?? GroupTag()
     }
     
-    public static func buildEither(first component: Tag) -> Tag {
+    public static func buildEither(first component: TagRepresentable) -> TagRepresentable {
         component
     }
 
-    public static func buildEither(second component: Tag) -> Tag {
+    public static func buildEither(second component: TagRepresentable) -> TagRepresentable {
         component
     }
     
-    public static func buildArray(_ components: [Tag]) -> Tag {
+    public static func buildArray(_ components: [TagRepresentable]) -> TagRepresentable {
         GroupTag(components)
     }
 }
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index 8ccb577..8fb4071 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -27,7 +27,7 @@ open class TypedTag: Tag {
     public init(name: String? = nil,
                 contents: String? = nil,
                 attributes: [Attribute] = [],
-                _ children: [Tag] = []) {
+                _ children: [TagRepresentable] = []) {
         let node = Self.node(name: name ?? Self.name, contents: contents, attributes: attributes)
         super.init(node: node, children)
     }
@@ -35,14 +35,14 @@ open class TypedTag: Tag {
     public convenience init(name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute] = [],
-                            _ child: Tag) {
+                            _ child: TagRepresentable) {
         self.init(name: name, contents: contents, attributes: attributes, [child])
     }
     
     public convenience init(name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute] = [],
-                            @TagBuilder _ builder: () -> Tag) {
+                            @TagBuilder _ builder: () -> TagRepresentable) {
         self.init(name: name, contents: contents, attributes: attributes, [builder()])
     }
     
@@ -53,11 +53,3 @@ open class TypedTag: Tag {
         self.init(name: name, contents: contents, attributes: attributes)
     }
 }
-
-public extension String {
-    
-    /// convert class names into node names
-    init(_ `class`: AnyClass) {
-        self.init(stringLiteral: .init(describing: `class`.self).lowercased())
-    }
-}
diff --git a/Sources/SwiftSitemap/SitemapIndex.swift b/Sources/SwiftSitemap/SitemapIndex.swift
index 78ad84e..bbfc12c 100644
--- a/Sources/SwiftSitemap/SitemapIndex.swift
+++ b/Sources/SwiftSitemap/SitemapIndex.swift
@@ -9,7 +9,7 @@ open class SitemapIndex: StandardTag {
     
     override open class var name: String { .init(SitemapIndex.self) }
 
-    public init(@TagBuilder _ builder: () -> Tag) {
+    public init(@TagBuilder _ builder: () -> TagRepresentable) {
         super.init([builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
diff --git a/Sources/SwiftSitemap/UrlSet.swift b/Sources/SwiftSitemap/UrlSet.swift
index c9a7c2d..f7f9747 100644
--- a/Sources/SwiftSitemap/UrlSet.swift
+++ b/Sources/SwiftSitemap/UrlSet.swift
@@ -9,7 +9,7 @@ open class UrlSet: StandardTag {
     
     override open class var name: String { .init(UrlSet.self) }
 
-    public init(@TagBuilder _ builder: () -> Tag) {
+    public init(@TagBuilder _ builder: () -> TagRepresentable) {
         super.init([builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
diff --git a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
index 481f9b0..8b349ca 100644
--- a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
+++ b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
@@ -10,7 +10,7 @@ import XCTest
 
 extension Div {
 
-    convenience init(_ value: String, @TagBuilder _ builder: () -> Tag) {
+    convenience init(_ value: String, @TagBuilder _ builder: () -> TagRepresentable) {
         self.init(builder)
         self.setAttributes([
             .init(key: "some-key", value: value)

From 3b4553b527f6f09f259979c0bc38dff51b335c73 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:13:54 -0400
Subject: [PATCH 042/141] Text changes

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ad08656..a0abf9d 100644
--- a/README.md
+++ b/README.md
@@ -155,17 +155,17 @@ open class Rss: Tag {
 // <rss version="2.0">...</rss> - tag with a default attribute
 ```
 
-
 To customize tags of a particular type...
 
 ```html
 <standard></standard>
 <empty>
-<!-- comment -->
+<!-- your comments here -->
 ```
 
 ...use the `TypedTag` classes: `StandardTag`, `EmptyTag` and `CommentTag`
 
+Avoid subclassing `TypedTag` directly unless absolutely necessary.
 
 If you get into coding situations where tags need to be combined without the container rendering, use the `GroupTag`. This class is especially handy when the function calls for a single `Tag` and you want to supply many.
 

From 566b641065ff056d1a260a367e0fb4f4d25a7f68 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:14:58 -0400
Subject: [PATCH 043/141] Text changes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a0abf9d..38fa4e6 100644
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ class MyTag: Tag {
 class MyClass { }
 
 extension MyClass: TagRepresentable {
-    ... implement protocol requirements
+    // ... implement protocol requirements
 }
 ```
 

From 8804656f3fb7b237c9366c705fecc68c334a71c8 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:20:35 -0400
Subject: [PATCH 044/141] Text edits

---
 README.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 38fa4e6..00fe746 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ That's it.
 
 ## Creating custom tags
 
-You can define your own custom tags a few different ways, from most simple to complex cases.
+You can define your own custom tags a few different ways, from simple to complex cases.
 
 1. Just subclass `Tag` and it will render with your class name lowercased.
 
@@ -129,6 +129,19 @@ class MyClass { }
 extension MyClass: TagRepresentable {
     // ... implement protocol requirements
 }
+
+class MyInnerClass: TagRepresentable {}
+
+class MyInnerMostClass: TagRepresentable {}
+
+// can now be used...
+MyClass {
+    MyInnerClass {
+        MyInnerMostClass {
+            // etc.
+        }
+    }
+}
 ```
 
 It is also possible to create tags with altered content or default attributes.

From e4db9570bcab0f763a14c92313de4762af11162f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:30:38 -0400
Subject: [PATCH 045/141] Text edits

---
 README.md | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 00fe746..a8d93c1 100644
--- a/README.md
+++ b/README.md
@@ -124,24 +124,40 @@ class MyTag: Tag {
 5. Implement the `TagRepresentable` protocol in your own class. It is very simple, can be customized with an extension, and allows any class to render as nested tags.
 
 ```swift
-class MyClass { }
+class MyInnerClass: TagRepresentable { }
 
-extension MyClass: TagRepresentable {
+extension MyInnerClass: TagRepresentable {
     // ... implement protocol requirements
 }
 
-class MyInnerClass: TagRepresentable {}
-
 class MyInnerMostClass: TagRepresentable {}
 
 // can now be used...
-MyClass {
-    MyInnerClass {
-        MyInnerMostClass {
-            // etc.
+class MyClass {
+
+    init(myAttributeValue: String, @TagBuilder _ builder: () -> Tag) {
+        let attribute = .init(key: "myKey", value: myAttributeValue)
+        let node = Node(type: .group, name: "myTag", attributes: [attribute])
+        super.init(node: node, [content(builder)])
+    }
+    
+    @TagBuilder
+    func content(_ builder: () -> Tag) -> Tag {
+        MyInnerClass {
+            MyInnerMostClass {
+                builder()
+            }
         }
     }
 }
+
+//  * MyClass is a .group node so it does not render
+//
+//  <myinnerclass>
+//      <myinnermostclass>
+//          // ... contents of builder parameter
+//      </myinnermostclass>
+//  <myinnerclss>
 ```
 
 It is also possible to create tags with altered content or default attributes.

From e79646e24b0fcff99fc81e318a527e660f8afaa5 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:33:45 -0400
Subject: [PATCH 046/141] Text edits

---
 README.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index a8d93c1..bc09f73 100644
--- a/README.md
+++ b/README.md
@@ -132,13 +132,10 @@ extension MyInnerClass: TagRepresentable {
 
 class MyInnerMostClass: TagRepresentable {}
 
-// can now be used...
-class MyClass {
+class MyOuterClass: GroupTag {
 
-    init(myAttributeValue: String, @TagBuilder _ builder: () -> Tag) {
-        let attribute = .init(key: "myKey", value: myAttributeValue)
-        let node = Node(type: .group, name: "myTag", attributes: [attribute])
-        super.init(node: node, [content(builder)])
+    init@TagBuilder _ builder: () -> Tag) {
+        super.init([content(builder)])
     }
     
     @TagBuilder
@@ -151,7 +148,7 @@ class MyClass {
     }
 }
 
-//  * MyClass is a .group node so it does not render
+//  * MyOuterClass is a GroupTag so it does not render
 //
 //  <myinnerclass>
 //      <myinnermostclass>

From 08fc246e4f33e294b64de2d323d3eeb8767a5696 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 11:41:51 -0400
Subject: [PATCH 047/141] Text edits

---
 README.md                   | 5 +++++
 Sources/SwiftSgml/Tag.swift | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bc09f73..e8993b0 100644
--- a/README.md
+++ b/README.md
@@ -184,8 +184,13 @@ open class Rss: Tag {
 To customize tags of a particular type...
 
 ```html
+// Open and close tags, use StandardTag class
 <standard></standard>
+
+// Empty tag, use EmptyTag class
 <empty>
+
+// Comment tag, use CommentTag class
 <!-- your comments here -->
 ```
 
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 6a5bfd4..a46948e 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -44,7 +44,7 @@ public protocol TagRepresentable {
 }
 
 
-//  This is a basic implementation of the TagRepresentable protocol.
+//  Tag is an implementation of the TagRepresentable protocol.
 //
 //  See README.md for detailed options on how to use the class.
 

From 6e67a47648e3fad442629650bc884feaddc8e3b8 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 11:42:39 -0400
Subject: [PATCH 048/141] Text edits

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e8993b0..2228103 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ open class Rss: Tag {
 // <rss version="2.0">...</rss> - tag with a default attribute
 ```
 
-To customize tags of a particular type...
+To customize tags of a particular `Node` type...
 
 ```html
 // Open and close tags, use StandardTag class

From ade4c9a799bfd755af7e70c6f104d37706ab3789 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 11:44:08 -0400
Subject: [PATCH 049/141] Text edits

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2228103..c9e651c 100644
--- a/README.md
+++ b/README.md
@@ -184,10 +184,10 @@ open class Rss: Tag {
 To customize tags of a particular `Node` type...
 
 ```html
-// Open and close tags, use StandardTag class
+// Bracketed tags, use StandardTag class
 <standard></standard>
 
-// Empty tag, use EmptyTag class
+// Single tag, use EmptyTag class
 <empty>
 
 // Comment tag, use CommentTag class

From f3650deea0fc3cdb4a0b508a85c2e449f52b3616 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:06:59 -0400
Subject: [PATCH 050/141] Text edits

---
 README.md | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index c9e651c..4dffd00 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ That's it.
 
 You can define your own custom tags a few different ways, from simple to complex cases.
 
-1. Just subclass `Tag` and it will render with your class name lowercased.
+1. Subclass `Tag` and it will render with your class name lowercased.
 
 ```swift
 class MyTag: Tag { }
@@ -106,7 +106,7 @@ class MyTag: Tag {
 // <myTag>
 ```
 
-4. Subclass, create your own custom initializer and then call the `Tag` designated initializer.
+4. Subclass `Tag`, create your own custom initializer and then call the `Tag` designated initializer.
 
 ```swift
 class MyTag: Tag {
@@ -183,22 +183,19 @@ open class Rss: Tag {
 
 To customize tags of a particular `Node` type...
 
-```html
-// Bracketed tags, use StandardTag class
-<standard></standard>
-
-// Single tag, use EmptyTag class
-<empty>
+```swift
+// Bracketed tags... <standard></standard> ...use StandardTag class
+class MyClass: StandardTag { }
 
-// Comment tag, use CommentTag class
-<!-- your comments here -->
-```
 
-...use the `TypedTag` classes: `StandardTag`, `EmptyTag` and `CommentTag`
+// Single tag... <empty> ...use EmptyTag class
+class MyClass: EmptyTag { }
 
-Avoid subclassing `TypedTag` directly unless absolutely necessary.
+// Comment tag... <!-- your comments here --> ...use CommentTag class
+class MyClass: CommentTag { }
+```
 
-If you get into coding situations where tags need to be combined without the container rendering, use the `GroupTag`. This class is especially handy when the function calls for a single `Tag` and you want to supply many.
+When you need to combined multiple tags into one, but don't want the container to render, use the `GroupTag`. This class is especially handy when a function parameter requires one `Tag` but you need to supply many.
 
 ```swift
 class MyTag: Tag {
@@ -223,7 +220,7 @@ class MyTag: Tag {
 }
 ```
 
-And if you just need to render standard HTML — `<div>`, `<p>`, `<a>`, etc. — use one the pre-made classes in the library.
+If you just need to render basic HTML — `<div>`, `<p>`, `<a>`, etc. — then use one the many pre-made classes in the library called by the same name.
 
 ## Attribute management
 

From f4c3862a38224db3ab43c03a7d7b1c44557b9af9 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:08:31 -0400
Subject: [PATCH 051/141] Text edits

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4dffd00..9dfc506 100644
--- a/README.md
+++ b/README.md
@@ -184,11 +184,10 @@ open class Rss: Tag {
 To customize tags of a particular `Node` type...
 
 ```swift
-// Bracketed tags... <standard></standard> ...use StandardTag class
+// Bracketed tags... <tagname></tagname> ...use StandardTag class
 class MyClass: StandardTag { }
 
-
-// Single tag... <empty> ...use EmptyTag class
+// Single tag... <tagname> ...use EmptyTag class
 class MyClass: EmptyTag { }
 
 // Comment tag... <!-- your comments here --> ...use CommentTag class

From 6fde18a3b5ee8d41ca4b6f61bf9890e1f8f57881 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:10:39 -0400
Subject: [PATCH 052/141] Text edits

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9dfc506..b7553d9 100644
--- a/README.md
+++ b/README.md
@@ -210,13 +210,17 @@ class MyTag: Tag {
             // must return one Tag for builder parameter
             // use GroupTag because it will not render 
             GroupTag {
-                Tag()
-                Tag()
-                Tag()
+                TagA()
+                TagB()
+                TagC()
             }
         }
     }
 }
+
+//  <taga></taga>
+//  <tagb></tagb>
+//  <tagc></tagc>
 ```
 
 If you just need to render basic HTML — `<div>`, `<p>`, `<a>`, etc. — then use one the many pre-made classes in the library called by the same name.

From 3ec05f3b8d0c314ae1d01b65dcf8b653e4692b9b Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:13:28 -0400
Subject: [PATCH 053/141] Text edits

---
 README.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b7553d9..b830588 100644
--- a/README.md
+++ b/README.md
@@ -135,17 +135,15 @@ class MyInnerMostClass: TagRepresentable {}
 class MyOuterClass: GroupTag {
 
     init@TagBuilder _ builder: () -> Tag) {
-        super.init([content(builder)])
-    }
-    
-    @TagBuilder
-    func content(_ builder: () -> Tag) -> Tag {
-        MyInnerClass {
-            MyInnerMostClass {
-                builder()
+        @TagBuilder func content(_ builder: () -> Tag) -> Tag {
+            MyInnerClass {
+                MyInnerMostClass {
+                    builder()
+                }
             }
         }
-    }
+        super.init([content(builder)])
+    }    
 }
 
 //  * MyOuterClass is a GroupTag so it does not render

From bd61e0ba721954b2fb2b2229b01f319cc28ed117 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:16:45 -0400
Subject: [PATCH 054/141] Text edits

---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index b830588..cff1570 100644
--- a/README.md
+++ b/README.md
@@ -124,20 +124,20 @@ class MyTag: Tag {
 5. Implement the `TagRepresentable` protocol in your own class. It is very simple, can be customized with an extension, and allows any class to render as nested tags.
 
 ```swift
-class MyInnerClass: TagRepresentable { }
+class ChildA: TagRepresentable { }
 
-extension MyInnerClass: TagRepresentable {
+extension ChildA: TagRepresentable {
     // ... implement protocol requirements
 }
 
-class MyInnerMostClass: TagRepresentable {}
+class ChildB: TagRepresentable {}
 
-class MyOuterClass: GroupTag {
+class Parent: GroupTag {
 
     init@TagBuilder _ builder: () -> Tag) {
         @TagBuilder func content(_ builder: () -> Tag) -> Tag {
-            MyInnerClass {
-                MyInnerMostClass {
+            ChildA {
+                ChildB {
                     builder()
                 }
             }
@@ -146,13 +146,13 @@ class MyOuterClass: GroupTag {
     }    
 }
 
-//  * MyOuterClass is a GroupTag so it does not render
+//  * Parent is a GroupTag so it does not render
 //
-//  <myinnerclass>
-//      <myinnermostclass>
+//  <childa>
+//      <childb>
 //          // ... contents of builder parameter
-//      </myinnermostclass>
-//  <myinnerclss>
+//      </childb>
+//  <childa>
 ```
 
 It is also possible to create tags with altered content or default attributes.

From 2fde37b068e0094fec4245613fc16ed6db2f0c82 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:17:21 -0400
Subject: [PATCH 055/141] Text edits

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cff1570..fd470b9 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ class MyTag: Tag {
 5. Implement the `TagRepresentable` protocol in your own class. It is very simple, can be customized with an extension, and allows any class to render as nested tags.
 
 ```swift
-class ChildA: TagRepresentable { }
+class ChildA { }
 
 extension ChildA: TagRepresentable {
     // ... implement protocol requirements

From 7809a4f9b8410cae8d5a018167e88f9dbb5651c5 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:40:35 -0400
Subject: [PATCH 056/141] Removed TagRepresentable protocol... compiler fails
 when used in more complex environment

---
 README.md                                     | 18 +++----
 Sources/SwiftHtml/Attributes/Events.swift     |  2 +-
 Sources/SwiftHtml/Attributes/Global.swift     |  2 +-
 Sources/SwiftHtml/Tags/Map.swift              |  2 +-
 Sources/SwiftRss/Rss.swift                    |  2 +-
 Sources/SwiftSgml/Document.swift              |  4 +-
 Sources/SwiftSgml/DocumentRenderer.swift      |  8 +--
 Sources/SwiftSgml/Tag.swift                   | 51 ++-----------------
 Sources/SwiftSgml/TagBuilder.swift            | 14 ++---
 Sources/SwiftSgml/TypedTag.swift              |  6 +--
 Sources/SwiftSitemap/SitemapIndex.swift       |  2 +-
 Sources/SwiftSitemap/UrlSet.swift             |  2 +-
 Tests/SwiftHtmlTests/SwiftHtmlTests.swift     |  2 +-
 .../SwiftHtmlTests/TagCompositionTests.swift  | 12 ++---
 14 files changed, 43 insertions(+), 84 deletions(-)

diff --git a/README.md b/README.md
index fd470b9..a25d32e 100644
--- a/README.md
+++ b/README.md
@@ -121,16 +121,16 @@ class MyTag: Tag {
 // <myTag myKey="myAttributeValue">
 ```
 
-5. Implement the `TagRepresentable` protocol in your own class. It is very simple, can be customized with an extension, and allows any class to render as nested tags.
+5. Implement the `Tag` protocol in your own class. It is very simple, can be customized with an extension, and allows any class to render as nested tags.
 
 ```swift
 class ChildA { }
 
-extension ChildA: TagRepresentable {
+extension ChildA: Tag {
     // ... implement protocol requirements
 }
 
-class ChildB: TagRepresentable {}
+class ChildB: Tag {}
 
 class Parent: GroupTag {
 
@@ -282,12 +282,12 @@ There are other built-in type-safe attribute modifiers available on tags.
 You can come up with your own `Tag` composition system by introducing a new protocol.
 
 ```swift
-protocol TagRepresentable {
+protocol Tag {
 
     func build() -> Tag
 }
 
-struct ListComponent: TagRepresentable {
+struct ListComponent: Tag {
 
     let items: [String]
     
@@ -311,19 +311,19 @@ This way it is also possible to extend the `TagBuilder` to support the new proto
 ```swift
 extension TagBuilder {
 
-    static func buildExpression(_ expression: TagRepresentable) -> Tag {
+    static func buildExpression(_ expression: Tag) -> Tag {
         expression.build()
     }
     
-    static func buildExpression(_ expression: TagRepresentable) -> [Tag] {
+    static func buildExpression(_ expression: Tag) -> [Tag] {
         [expression.build()]
     }
 
-    static func buildExpression(_ expression: [TagRepresentable]) -> [Tag] {
+    static func buildExpression(_ expression: [Tag]) -> [Tag] {
         expression.map { $0.build() }
     }
 
-    static func buildExpression(_ expression: [TagRepresentable]) -> Tag {
+    static func buildExpression(_ expression: [Tag]) -> Tag {
         GroupTag {
             expression.map { $0.build() }
         }
diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 3cc807f..73c349e 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 07. 23..
 //
 
-public extension TagRepresentable {
+public extension Tag {
     
     // MARK: - Window Event Attributes
     
diff --git a/Sources/SwiftHtml/Attributes/Global.swift b/Sources/SwiftHtml/Attributes/Global.swift
index 3457114..eda1b2e 100644
--- a/Sources/SwiftHtml/Attributes/Global.swift
+++ b/Sources/SwiftHtml/Attributes/Global.swift
@@ -55,7 +55,7 @@ private extension Array where Element == String {
     }
 }
 
-public extension TagRepresentable {
+public extension Tag {
         
     // MARK: - class management
 
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index 4a0a137..8aa8483 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -14,7 +14,7 @@ open class Map: StandardTag {
     
     override open class var name: String { .init(Map.self) }
         
-    public init(name: String, @TagBuilder _ builder: () -> TagRepresentable) {
+    public init(name: String, @TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
         setAttributes([
             .init(key: "name", value: name)
diff --git a/Sources/SwiftRss/Rss.swift b/Sources/SwiftRss/Rss.swift
index 9573a8b..67770da 100644
--- a/Sources/SwiftRss/Rss.swift
+++ b/Sources/SwiftRss/Rss.swift
@@ -10,7 +10,7 @@ open class Rss: StandardTag {
     
     override open class var name: String { .init(Rss.self) }
     
-    public init(@TagBuilder _ builder: () -> TagRepresentable) {
+    public init(@TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
         setAttributes([
             .init(key: "version", value: "2.0"),
diff --git a/Sources/SwiftSgml/Document.swift b/Sources/SwiftSgml/Document.swift
index affa090..cd564f8 100644
--- a/Sources/SwiftSgml/Document.swift
+++ b/Sources/SwiftSgml/Document.swift
@@ -15,9 +15,9 @@ public struct Document {
     }
 
     public let type: `Type`
-    public let root: TagRepresentable
+    public let root: Tag
     
-    public init(_ type: `Type` = .unspecified, @TagBuilder _ builder: () -> TagRepresentable) {
+    public init(_ type: `Type` = .unspecified, @TagBuilder _ builder: () -> Tag) {
         self.type = type
         self.root = builder()
     }
diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index 0e4a83d..3a41cd5 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -36,7 +36,7 @@ public struct DocumentRenderer {
         }
     }
 
-    private func render(tag: TagRepresentable, level: Int = 0) -> String {
+    private func render(tag: Tag, level: Int = 0) -> String {
         let spaces = String(repeating: " ", count: level * indent)
         switch tag.node.type {
         case .standard:
@@ -54,7 +54,7 @@ public struct DocumentRenderer {
         }
     }
     
-    private func renderChildren(_ tag: TagRepresentable, level: Int, spaces: String, isGrouped: Bool = false) -> String {
+    private func renderChildren(_ tag: Tag, level: Int, spaces: String, isGrouped: Bool = false) -> String {
         var newLevel = level + 1
         if isGrouped {
             newLevel = level
@@ -68,11 +68,11 @@ public struct DocumentRenderer {
         return children
     }
     
-    private func renderOpening(_ tag: TagRepresentable) -> String {
+    private func renderOpening(_ tag: Tag) -> String {
         return "<" + tag.node.name + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
     }
     
-    private func renderClosing(_ tag: TagRepresentable) -> String {
+    private func renderClosing(_ tag: Tag) -> String {
         "</" + tag.node.name + ">"
     }
 
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index a46948e..181c8c5 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -5,53 +5,12 @@
 //  Created by Tibor Bodecs on 2021. 11. 19..
 //
 
-// This is the base protocol for tags.
-//
-//  Implement it in your own classes to render them.
-//
-//  Or use the pre-made class called `Tag`.
-//
-//  Extend it to customize for your needs.
-
-public protocol TagRepresentable {
-    
-    var node: Node { get }
-    var children: [TagRepresentable] { get }
-    
-    @discardableResult
-    func setContents(_ value: String?, _ condition: Bool) -> Self
-
-    // MARK: - attributes
-    
-    /// set attributes
-    @discardableResult
-    func setAttributes(_ attributes: [Attribute], _ condition: Bool) -> Self
-    
-    /// delete an attribute by a given key
-    @discardableResult
-    func deleteAttribute(_ key: String, _ condition: Bool) -> Self
-    
-    /// add a new attribute with a given value if the condition is true
-    @discardableResult
-    func attribute(_ key: String, _ value: String?, _ condition: Bool) -> Self
-
-    /// add a new flag-like attribute with a given value if the condition is true
-    ///
-    /// if the flag value is `nil` only the attribute key will be used. eg. `<foo bar></foo>`
-    ///
-    @discardableResult
-    func flagAttribute(_ key: String, _ value: String?, _ condition: Bool) -> Self
-}
-
-
-//  Tag is an implementation of the TagRepresentable protocol.
-//
 //  See README.md for detailed options on how to use the class.
 
-open class Tag: TagRepresentable {
+open class Tag {
         
     public private(set) var node: Node
-    public private(set) var children: [TagRepresentable]
+    public private(set) var children: [Tag]
     
     open class var node: Node { .init(type: .standard, name: Self.name) }
     
@@ -60,18 +19,18 @@ open class Tag: TagRepresentable {
     // MARK: - init
         
     /// initialize a new Tag with child tags
-    public init(node: Node? = nil, _ children: [TagRepresentable] = []) {
+    public init(node: Node? = nil, _ children: [Tag] = []) {
         self.node = node ?? Self.node
         self.children = children
     }
 
     /// initialize a new Tag with a single child tag
-    public convenience init(node: Node? = nil, _ child: TagRepresentable) {
+    public convenience init(node: Node? = nil, _ child: Tag) {
         self.init(node: node, [child])
     }
 
     /// initialize a new Tag with children using a builder
-    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> TagRepresentable) {
+    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
         self.init(node: node, [builder()])
     }
     
diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index 7fb8e31..60f7ef7 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -9,31 +9,31 @@
 @resultBuilder
 public enum TagBuilder {
     
-    public static func buildBlock() -> TagRepresentable {
+    public static func buildBlock() -> Tag {
         GroupTag()
     }
     
-    public static func buildBlock(_ components: [TagRepresentable]...) -> TagRepresentable {
+    public static func buildBlock(_ components: [Tag]...) -> Tag {
         GroupTag(components.flatMap { $0 })
     }
     
-    public static func buildBlock(_ components: TagRepresentable...) -> TagRepresentable {
+    public static func buildBlock(_ components: Tag...) -> Tag {
         GroupTag(components)
     }
     
-    public static func buildOptional(_ component: TagRepresentable?) -> TagRepresentable {
+    public static func buildOptional(_ component: Tag?) -> Tag {
         component ?? GroupTag()
     }
     
-    public static func buildEither(first component: TagRepresentable) -> TagRepresentable {
+    public static func buildEither(first component: Tag) -> Tag {
         component
     }
 
-    public static func buildEither(second component: TagRepresentable) -> TagRepresentable {
+    public static func buildEither(second component: Tag) -> Tag {
         component
     }
     
-    public static func buildArray(_ components: [TagRepresentable]) -> TagRepresentable {
+    public static func buildArray(_ components: [Tag]) -> Tag {
         GroupTag(components)
     }
 }
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index 8fb4071..ba20a8f 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -27,7 +27,7 @@ open class TypedTag: Tag {
     public init(name: String? = nil,
                 contents: String? = nil,
                 attributes: [Attribute] = [],
-                _ children: [TagRepresentable] = []) {
+                _ children: [Tag] = []) {
         let node = Self.node(name: name ?? Self.name, contents: contents, attributes: attributes)
         super.init(node: node, children)
     }
@@ -35,14 +35,14 @@ open class TypedTag: Tag {
     public convenience init(name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute] = [],
-                            _ child: TagRepresentable) {
+                            _ child: Tag) {
         self.init(name: name, contents: contents, attributes: attributes, [child])
     }
     
     public convenience init(name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute] = [],
-                            @TagBuilder _ builder: () -> TagRepresentable) {
+                            @TagBuilder _ builder: () -> Tag) {
         self.init(name: name, contents: contents, attributes: attributes, [builder()])
     }
     
diff --git a/Sources/SwiftSitemap/SitemapIndex.swift b/Sources/SwiftSitemap/SitemapIndex.swift
index bbfc12c..78ad84e 100644
--- a/Sources/SwiftSitemap/SitemapIndex.swift
+++ b/Sources/SwiftSitemap/SitemapIndex.swift
@@ -9,7 +9,7 @@ open class SitemapIndex: StandardTag {
     
     override open class var name: String { .init(SitemapIndex.self) }
 
-    public init(@TagBuilder _ builder: () -> TagRepresentable) {
+    public init(@TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
diff --git a/Sources/SwiftSitemap/UrlSet.swift b/Sources/SwiftSitemap/UrlSet.swift
index f7f9747..c9a7c2d 100644
--- a/Sources/SwiftSitemap/UrlSet.swift
+++ b/Sources/SwiftSitemap/UrlSet.swift
@@ -9,7 +9,7 @@ open class UrlSet: StandardTag {
     
     override open class var name: String { .init(UrlSet.self) }
 
-    public init(@TagBuilder _ builder: () -> TagRepresentable) {
+    public init(@TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
         setAttributes([
             .init(key: "xmlns", value: "http://www.sitemaps.org/schemas/sitemap/0.9"),
diff --git a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
index 8b349ca..481f9b0 100644
--- a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
+++ b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
@@ -10,7 +10,7 @@ import XCTest
 
 extension Div {
 
-    convenience init(_ value: String, @TagBuilder _ builder: () -> TagRepresentable) {
+    convenience init(_ value: String, @TagBuilder _ builder: () -> Tag) {
         self.init(builder)
         self.setAttributes([
             .init(key: "some-key", value: value)
diff --git a/Tests/SwiftHtmlTests/TagCompositionTests.swift b/Tests/SwiftHtmlTests/TagCompositionTests.swift
index 6eeed20..f00e041 100644
--- a/Tests/SwiftHtmlTests/TagCompositionTests.swift
+++ b/Tests/SwiftHtmlTests/TagCompositionTests.swift
@@ -8,33 +8,33 @@
 import XCTest
 @testable import SwiftHtml
 
-//protocol TagRepresentable {
+//protocol Tag {
 //
 //    func build() -> Tag
 //}
 //
 //extension TagBuilder {
 //
-//    static func buildExpression(_ expression: TagRepresentable) -> Tag {
+//    static func buildExpression(_ expression: Tag) -> Tag {
 //        expression.build()
 //    }
 //    
-//    static func buildExpression(_ expression: TagRepresentable) -> [Tag] {
+//    static func buildExpression(_ expression: Tag) -> [Tag] {
 //        [expression.build()]
 //    }
 //
-//    static func buildExpression(_ expression: [TagRepresentable]) -> [Tag] {
+//    static func buildExpression(_ expression: [Tag]) -> [Tag] {
 //        expression.map { $0.build() }
 //    }
 //
-//    static func buildExpression(_ expression: [TagRepresentable]) -> Tag {
+//    static func buildExpression(_ expression: [Tag]) -> Tag {
 //        GroupTag {
 //            expression.map { $0.build() }
 //        }
 //    }
 //}
 //
-//struct ListComponent: TagRepresentable {
+//struct ListComponent: Tag {
 //
 //    let items: [String]
 //    

From a37b3e865ca63aa04b78f6b2a58c446484000817 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:41:19 -0400
Subject: [PATCH 057/141] Text edits

---
 README.md | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/README.md b/README.md
index a25d32e..f933f84 100644
--- a/README.md
+++ b/README.md
@@ -121,40 +121,6 @@ class MyTag: Tag {
 // <myTag myKey="myAttributeValue">
 ```
 
-5. Implement the `Tag` protocol in your own class. It is very simple, can be customized with an extension, and allows any class to render as nested tags.
-
-```swift
-class ChildA { }
-
-extension ChildA: Tag {
-    // ... implement protocol requirements
-}
-
-class ChildB: Tag {}
-
-class Parent: GroupTag {
-
-    init@TagBuilder _ builder: () -> Tag) {
-        @TagBuilder func content(_ builder: () -> Tag) -> Tag {
-            ChildA {
-                ChildB {
-                    builder()
-                }
-            }
-        }
-        super.init([content(builder)])
-    }    
-}
-
-//  * Parent is a GroupTag so it does not render
-//
-//  <childa>
-//      <childb>
-//          // ... contents of builder parameter
-//      </childb>
-//  <childa>
-```
-
 It is also possible to create tags with altered content or default attributes.
 
 ```swift

From 196dc5ebc94976f5b21f946527eab8fe9ce23624 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:26:06 -0400
Subject: [PATCH 058/141] Update ScriptTagTests.swift

---
 Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift b/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift
index 93e5dc1..792bb2c 100644
--- a/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift
+++ b/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift
@@ -12,7 +12,7 @@ final class ScriptTagTests: XCTestCase {
 
     func testScript() {
         let doc = Document(.html) {
-            Script {}
+            Script ()
                 .src("./js/main.js")
                 .async()
         }
@@ -25,7 +25,7 @@ final class ScriptTagTests: XCTestCase {
     
     func testIntegrity() {
         let doc = Document {
-            Script {}
+            Script ()
                 .src("https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js")
                 .integrity("sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl")
                 .crossorigin(.anonymous)

From c71fec3f8c6b27c1bd3c8048cb41b8fdf2e73856 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:26:52 -0400
Subject: [PATCH 059/141] Update ScriptTagTests.swift

---
 Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift b/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift
index 792bb2c..3ff24da 100644
--- a/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift
+++ b/Tests/SwiftHtmlTests/Tags/ScriptTagTests.swift
@@ -12,7 +12,7 @@ final class ScriptTagTests: XCTestCase {
 
     func testScript() {
         let doc = Document(.html) {
-            Script ()
+            Script()
                 .src("./js/main.js")
                 .async()
         }
@@ -25,7 +25,7 @@ final class ScriptTagTests: XCTestCase {
     
     func testIntegrity() {
         let doc = Document {
-            Script ()
+            Script()
                 .src("https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js")
                 .integrity("sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl")
                 .crossorigin(.anonymous)

From 6068a3f88067ccf494090b2989914ebd1df2b3b9 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:30:16 -0400
Subject: [PATCH 060/141] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f933f84..906e7bc 100644
--- a/README.md
+++ b/README.md
@@ -277,19 +277,19 @@ This way it is also possible to extend the `TagBuilder` to support the new proto
 ```swift
 extension TagBuilder {
 
-    static func buildExpression(_ expression: Tag) -> Tag {
+    static func buildExpression(_ expression: TagRepresentable) -> Tag {
         expression.build()
     }
     
-    static func buildExpression(_ expression: Tag) -> [Tag] {
+    static func buildExpression(_ expression: TagRepresentable) -> [Tag] {
         [expression.build()]
     }
 
-    static func buildExpression(_ expression: [Tag]) -> [Tag] {
+    static func buildExpression(_ expression: [TagRepresentable]) -> [Tag] {
         expression.map { $0.build() }
     }
 
-    static func buildExpression(_ expression: [Tag]) -> Tag {
+    static func buildExpression(_ expression: [TagRepresentable]) -> Tag {
         GroupTag {
             expression.map { $0.build() }
         }

From 925a3f94cbfeb640b6ca118bfd48ddb704b9743f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:31:33 -0400
Subject: [PATCH 061/141] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 906e7bc..3a7a709 100644
--- a/README.md
+++ b/README.md
@@ -248,12 +248,12 @@ There are other built-in type-safe attribute modifiers available on tags.
 You can come up with your own `Tag` composition system by introducing a new protocol.
 
 ```swift
-protocol Tag {
+protocol TagRepresentable {
 
     func build() -> Tag
 }
 
-struct ListComponent: Tag {
+struct ListComponent: TagRepresentable {
 
     let items: [String]
     

From 11346530eed72a3b01aeaa6d7e0e73d8ae63e89f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:34:51 -0400
Subject: [PATCH 062/141] Update Global.swift

---
 Sources/SwiftHtml/Attributes/Global.swift | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Global.swift b/Sources/SwiftHtml/Attributes/Global.swift
index eda1b2e..1daf2ca 100644
--- a/Sources/SwiftHtml/Attributes/Global.swift
+++ b/Sources/SwiftHtml/Attributes/Global.swift
@@ -235,61 +235,61 @@ public extension Tag {
     
     /// Specifies a shortcut key to activate/focus an element
     func accesskey(_ value: Character) -> Self {
-        attribute("accesskey", String(value), true)
+        attribute("accesskey", String(value))
     }
     
     /// Specifies whether the content of an element is editable or not
     func contenteditable(_ value: Bool) -> Self {
-        attribute("contenteditable", String(value), true)
+        attribute("contenteditable", String(value))
     }
     
     /// Used to store custom data private to the page or application
     func data(key: String, _ value: String) -> Self {
-        attribute("data-" + key, value, true)
+        attribute("data-" + key, value)
     }
 
     /// Specifies the text direction for the content in an element
     func dir(_ value: TextDirection = .ltr) -> Self {
-        attribute("dir", value.rawValue, true)
+        attribute("dir", value.rawValue)
     }
     
     /// Specifies whether an element is draggable or not
     func draggable(_ value: Draggable = .auto) -> Self {
-        attribute("draggable", value.rawValue, true)
+        attribute("draggable", value.rawValue)
     }
     
     /// Specifies that an element is not yet, or is no longer, relevant
     func hidden(_ value: Bool? = nil) -> Self {
-        attribute("hidden", value?.description, true)
+        attribute("hidden", value?.description)
     }
     
     /// Specifies a unique id for an element
     func `id`(_ value: String) -> Self {
-        attribute("id", value, true)
+        attribute("id", value)
     }
     
     /// Specifies the language of the element's content
     func lang(_ value: String) -> Self {
-        attribute("lang", value, true)
+        attribute("lang", value)
     }
     
     /// Specifies whether the element is to have its spelling and grammar checked or not
     func spellcheck(_ value: Bool) -> Self {
-        attribute("spellcheck", String(value), true)
+        attribute("spellcheck", String(value))
     }
     
     /// Specifies the tabbing order of an element
     func tabindex(_ value: Int) -> Self {
-        attribute("tabindex", String(value), true)
+        attribute("tabindex", String(value))
     }
     
     /// Specifies extra information about an element
     func title(_ value: String) -> Self {
-        attribute("title", value, true)
+        attribute("title", value)
     }
     
     /// Specifies whether the content of an element should be translated or not
     func translate(_ value: Translate) -> Self {
-        attribute("translate", value.rawValue, true)
+        attribute("translate", value.rawValue)
     }
 }

From 1ff06622521c73964fe84e2bcd495ec6e0d03677 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:39:22 -0400
Subject: [PATCH 063/141] Update Text.swift

---
 Sources/SwiftHtml/Text.swift | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Sources/SwiftHtml/Text.swift b/Sources/SwiftHtml/Text.swift
index 92322ad..c982ddf 100644
--- a/Sources/SwiftHtml/Text.swift
+++ b/Sources/SwiftHtml/Text.swift
@@ -6,4 +6,10 @@
 //
 
 /// a plain text node to write simple textual content into the html tree
-open class Text: GroupTag {}
+open class Text: GroupTag {
+
+  public init(_ contents: String) {
+         super.init()
+         setContents(contents)
+  }
+}

From 365c5c63b7be62f25f806dd7964cc3e7b522f22d Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:46:08 -0400
Subject: [PATCH 064/141] Update TagCompositionTests.swift

---
 Tests/SwiftHtmlTests/TagCompositionTests.swift | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Tests/SwiftHtmlTests/TagCompositionTests.swift b/Tests/SwiftHtmlTests/TagCompositionTests.swift
index f00e041..6eeed20 100644
--- a/Tests/SwiftHtmlTests/TagCompositionTests.swift
+++ b/Tests/SwiftHtmlTests/TagCompositionTests.swift
@@ -8,33 +8,33 @@
 import XCTest
 @testable import SwiftHtml
 
-//protocol Tag {
+//protocol TagRepresentable {
 //
 //    func build() -> Tag
 //}
 //
 //extension TagBuilder {
 //
-//    static func buildExpression(_ expression: Tag) -> Tag {
+//    static func buildExpression(_ expression: TagRepresentable) -> Tag {
 //        expression.build()
 //    }
 //    
-//    static func buildExpression(_ expression: Tag) -> [Tag] {
+//    static func buildExpression(_ expression: TagRepresentable) -> [Tag] {
 //        [expression.build()]
 //    }
 //
-//    static func buildExpression(_ expression: [Tag]) -> [Tag] {
+//    static func buildExpression(_ expression: [TagRepresentable]) -> [Tag] {
 //        expression.map { $0.build() }
 //    }
 //
-//    static func buildExpression(_ expression: [Tag]) -> Tag {
+//    static func buildExpression(_ expression: [TagRepresentable]) -> Tag {
 //        GroupTag {
 //            expression.map { $0.build() }
 //        }
 //    }
 //}
 //
-//struct ListComponent: Tag {
+//struct ListComponent: TagRepresentable {
 //
 //    let items: [String]
 //    

From b921b7055507e413fa246feb812ceff03e4e6d2b Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 15:02:26 -0400
Subject: [PATCH 065/141] Update assert.swift

---
 Tests/SwiftSitemapTests/assert.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/SwiftSitemapTests/assert.swift b/Tests/SwiftSitemapTests/assert.swift
index f21a556..c7d16f5 100644
--- a/Tests/SwiftSitemapTests/assert.swift
+++ b/Tests/SwiftSitemapTests/assert.swift
@@ -13,6 +13,6 @@ func assert(doc: Document, html: String) {
     let expectation = html
         .replacingOccurrences(of: "    ", with: "")
         .replacingOccurrences(of: "\n", with: "")
-    print(renderer.render(doc))
+    
     XCTAssertEqual(renderer.render(doc), expectation)
 }

From 79fb43b693229e265aa1caace5d87cf1ff85d53c Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 15:03:13 -0400
Subject: [PATCH 066/141] Update assert.swift

---
 Tests/SwiftSitemapTests/assert.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Tests/SwiftSitemapTests/assert.swift b/Tests/SwiftSitemapTests/assert.swift
index c7d16f5..fcb75c4 100644
--- a/Tests/SwiftSitemapTests/assert.swift
+++ b/Tests/SwiftSitemapTests/assert.swift
@@ -13,6 +13,5 @@ func assert(doc: Document, html: String) {
     let expectation = html
         .replacingOccurrences(of: "    ", with: "")
         .replacingOccurrences(of: "\n", with: "")
-    
     XCTAssertEqual(renderer.render(doc), expectation)
 }

From b16f44cb4cd0bfe2280112d12a874aabd35a4d3b Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 11 Jul 2023 15:49:50 -0400
Subject: [PATCH 067/141] Update Tag.swift

---
 Sources/SwiftSgml/Tag.swift | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 181c8c5..c48cbb9 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -8,14 +8,16 @@
 //  See README.md for detailed options on how to use the class.
 
 open class Tag {
-        
-    public private(set) var node: Node
-    public private(set) var children: [Tag]
     
+    // override to implement a default Node
     open class var node: Node { .init(type: .standard, name: Self.name) }
     
+    // override to customize the <tag_name>
     open class var name: String { .init(self).lowercased() }
-    
+
+    public private(set) var node: Node
+    public private(set) var children: [Tag]
+        
     // MARK: - init
         
     /// initialize a new Tag with child tags

From af16cd993656015db22bff59a5d5045eac82a0d2 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 12 Jul 2023 11:56:17 -0400
Subject: [PATCH 068/141] Tag does not render by default. Init() options and
 subclasses allow customization.

---
 Sources/SwiftHtml/Attributes/Global.swift  |   4 +-
 Sources/SwiftHtml/Tags/Article.swift       |   6 --
 Sources/SwiftHtml/Text.swift               |   2 +-
 Sources/SwiftSgml/CommentTag.swift         |   2 +-
 Sources/SwiftSgml/DocumentRenderer.swift   |  22 ++---
 Sources/SwiftSgml/EmptyTag.swift           |   2 +-
 Sources/SwiftSgml/GroupTag.swift           |  11 ---
 Sources/SwiftSgml/Node.swift               | 100 ++++++++++-----------
 Sources/SwiftSgml/StandardTag.swift        |   2 +-
 Sources/SwiftSgml/Tag.swift                |  99 +++++++++++++-------
 Sources/SwiftSgml/TagBuilder.swift         |  10 +--
 Sources/SwiftSgml/TypedTag.swift           |  53 +++++------
 Tests/SwiftHtmlTests/SwiftHtmlTests.swift  |   2 +-
 Tests/SwiftSgmlTests/TagBuilderTests.swift |   8 +-
 14 files changed, 164 insertions(+), 159 deletions(-)
 delete mode 100644 Sources/SwiftSgml/GroupTag.swift

diff --git a/Sources/SwiftHtml/Attributes/Global.swift b/Sources/SwiftHtml/Attributes/Global.swift
index 1daf2ca..c1265f5 100644
--- a/Sources/SwiftHtml/Attributes/Global.swift
+++ b/Sources/SwiftHtml/Attributes/Global.swift
@@ -61,7 +61,7 @@ public extension Tag {
 
     /// find an existing class attribute and return the value as an array of strings or an empty array
     private var classArray: [String] {
-        node.attributes.first { $0.key == "class" }?.value?.classArray ?? []
+        attributes?.first { $0.key == "class" }?.value?.classArray ?? []
     }
 
     /// Specifies one classname for an element (refers to a class in a style sheet)
@@ -137,7 +137,7 @@ public extension Tag {
 
     /// find an existing style attribute and return the value as an array of strings or an empty array
     private var styleArray: [String] {
-        node.attributes.first { $0.key == "style" }?.value?.styleArray ?? []
+        attributes?.first { $0.key == "style" }?.value?.styleArray ?? []
     }
 
     /// Specifies one stylename for an element (refers to a style in a style sheet)
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index b45b09c..87eaf45 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -5,12 +5,6 @@
 //  Created by Tibor Bodecs on 2021. 07. 19..
 //
 
-public extension Node {
-
-    static func article() -> Node {
-        Node(type: .standard, name: "article")
-    }
-}
 
 /// The `<article>` tag specifies independent, self-contained content.
 ///
diff --git a/Sources/SwiftHtml/Text.swift b/Sources/SwiftHtml/Text.swift
index c982ddf..1c34a5f 100644
--- a/Sources/SwiftHtml/Text.swift
+++ b/Sources/SwiftHtml/Text.swift
@@ -6,7 +6,7 @@
 //
 
 /// a plain text node to write simple textual content into the html tree
-open class Text: GroupTag {
+open class Text: Tag {
 
   public init(_ contents: String) {
          super.init()
diff --git a/Sources/SwiftSgml/CommentTag.swift b/Sources/SwiftSgml/CommentTag.swift
index 61a6057..bd65503 100644
--- a/Sources/SwiftSgml/CommentTag.swift
+++ b/Sources/SwiftSgml/CommentTag.swift
@@ -7,5 +7,5 @@
 
 open class CommentTag: TypedTag {
         
-    override open class var type: Node.NodeType { .comment }    
+    override open class var type: `Type` { .comment }    
 }
diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index 3a41cd5..b7acdfc 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -38,16 +38,16 @@ public struct DocumentRenderer {
 
     private func render(tag: Tag, level: Int = 0) -> String {
         let spaces = String(repeating: " ", count: level * indent)
-        switch tag.node.type {
-        case .standard:
-            return spaces + renderOpening(tag) + (tag.node.contents ?? "") + renderChildren(tag, level: level, spaces: spaces) + renderClosing(tag)
+        switch tag.type {
         case .comment:
-            return spaces + "<!-- " + (tag.node.contents ?? "") + " -->"
+            return spaces + "<!-- " + (tag.contents ?? "") + " -->"
         case .empty:
             return spaces + renderOpening(tag)
-        case .group:
+        case .standard:
+            return spaces + renderOpening(tag) + (tag.contents ?? "") + renderChildren(tag, level: level, spaces: spaces) + renderClosing(tag)
+        case .renderless:
             var contents = ""
-            if let rawValue = tag.node.contents {
+            if let rawValue = tag.contents {
                 contents = spaces + rawValue
             }
             return contents + renderChildren(tag, level: level, spaces: spaces, isGrouped: true)
@@ -59,7 +59,8 @@ public struct DocumentRenderer {
         if isGrouped {
             newLevel = level
         }
-        var children = tag.children.map { render(tag: $0, level: newLevel) }.joined(separator: newline)
+        let tagChildren = tag.children ?? []
+        var children = tagChildren.map { render(tag: $0, level: newLevel) }.joined(separator: newline)
         if !children.isEmpty {
             if !isGrouped {
                 children = newline + children + newline + spaces
@@ -69,15 +70,16 @@ public struct DocumentRenderer {
     }
     
     private func renderOpening(_ tag: Tag) -> String {
-        return "<" + tag.node.name + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
+        let attributes = tag.attributes ?? []
+        return "<" + tag.name + (attributes.isEmpty ? "" : " ") + renderAttributes(attributes) + ">"
     }
     
     private func renderClosing(_ tag: Tag) -> String {
-        "</" + tag.node.name + ">"
+        "</" + tag.name + ">"
     }
 
     private func renderAttributes(_ attributes: [Attribute]) -> String {
-        return attributes.reduce([]) { res, next in
+        attributes.reduce([]) { res, next in
             if let value = next.value {
                 return res + [next.key + #"=""# + value + #"""#]
             }
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index 649a243..f5c09cc 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -7,5 +7,5 @@
 
 open class EmptyTag: TypedTag {
     
-    override open class var type: Node.NodeType { .empty }
+    override open class var type: `Type` { .empty }
 }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
deleted file mode 100644
index eeee847..0000000
--- a/Sources/SwiftSgml/GroupTag.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-//  GroupTag.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 02. 11..
-//
-
-open class GroupTag: TypedTag {
-        
-    override open class var type: Node.NodeType { .group }
-}
diff --git a/Sources/SwiftSgml/Node.swift b/Sources/SwiftSgml/Node.swift
index 8094d7d..93d2698 100644
--- a/Sources/SwiftSgml/Node.swift
+++ b/Sources/SwiftSgml/Node.swift
@@ -1,53 +1,53 @@
+////
+////  Node.swift
+////  SwiftSgml
+////
+////  Created by Tibor Bodecs on 2021. 07. 19..
+////
 //
-//  Node.swift
-//  SwiftSgml
+//public struct Node {
 //
-//  Created by Tibor Bodecs on 2021. 07. 19..
+//    /// internal node types
+//    public enum NodeType {
+//        /// standard container tags
+//        case standard     // <div>  </div>
+//        /// comment tag
+//        case comment      // <!--   -->
+//        // @TODO: force close tags? <br> vs <br/>
+//        /// non-container tags
+//        case empty        // <br>
+//        /// invisible node for grouping other nodes
+//        case group    // *invisible group*<h1>lorem</h1><p>ipsum</p>*invisible group*
+//    }
+//
+//    public let type: NodeType
+//    public let name: String
+//    public var contents: String?
+//    public internal(set) var attributes: [Attribute]
+//
+//    public init(type: NodeType = .standard,
+//         name: String,
+//         contents: String? = nil,
+//         attributes: [Attribute] = []
+//    ) {
+//        self.type = type
+//        self.name = name
+//        self.contents = contents
+//        self.attributes = attributes
+//    }
+//}
+//
+//public extension Node {
+//    
+//    /// add or replace an attribute with a given key to the node
+//    mutating func upsert(_ attribute: Attribute) {
+//        delete(attribute)
+//        attributes.append(attribute)
+//    }
+//
+//    /// deletes a attribute with a given key from the node
+//    mutating func delete(_ attribute: Attribute) {
+//        attributes = attributes.filter { $0.key != attribute.key }
+//    }
+//}
 //
-
-public struct Node {
-
-    /// internal node types
-    public enum NodeType {
-        /// standard container tags
-        case standard     // <div>  </div>
-        /// comment tag
-        case comment      // <!--   -->
-        // @TODO: force close tags? <br> vs <br/>
-        /// non-container tags
-        case empty        // <br>
-        /// invisible node for grouping other nodes
-        case group    // *invisible group*<h1>lorem</h1><p>ipsum</p>*invisible group*
-    }
-
-    public let type: NodeType
-    public let name: String
-    public var contents: String?
-    public internal(set) var attributes: [Attribute]
-
-    public init(type: NodeType = .standard,
-         name: String,
-         contents: String? = nil,
-         attributes: [Attribute] = []
-    ) {
-        self.type = type
-        self.name = name
-        self.contents = contents
-        self.attributes = attributes
-    }
-}
-
-public extension Node {
-    
-    /// add or replace an attribute with a given key to the node
-    mutating func upsert(_ attribute: Attribute) {
-        delete(attribute)
-        attributes.append(attribute)
-    }
-
-    /// deletes a attribute with a given key from the node
-    mutating func delete(_ attribute: Attribute) {
-        attributes = attributes.filter { $0.key != attribute.key }
-    }
-}
-
diff --git a/Sources/SwiftSgml/StandardTag.swift b/Sources/SwiftSgml/StandardTag.swift
index c6b8ff5..2881d61 100644
--- a/Sources/SwiftSgml/StandardTag.swift
+++ b/Sources/SwiftSgml/StandardTag.swift
@@ -7,5 +7,5 @@
 
 open class StandardTag: TypedTag {
     
-    override open class var type: Node.NodeType { .standard }
+    override open class var type: `Type` { .standard }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index c48cbb9..9b275f8 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -9,39 +9,61 @@
 
 open class Tag {
     
-    // override to implement a default Node
-    open class var node: Node { .init(type: .standard, name: Self.name) }
+    public enum `Type` {
+        case comment    // <!-- -->
+        case empty      // <name>
+        case renderless // no tag
+        case standard   // <name></name>
+    }
+    
+    public let type: `Type`
+    public let name: String
+    public var contents: String?
+    public internal(set) var attributes: [Attribute]?
+    public private(set) var children: [Tag]?
     
-    // override to customize the <tag_name>
+    open class var type: `Type` { .renderless }
     open class var name: String { .init(self).lowercased() }
-
-    public private(set) var node: Node
-    public private(set) var children: [Tag]
         
     // MARK: - init
-        
-    /// initialize a new Tag with child tags
-    public init(node: Node? = nil, _ children: [Tag] = []) {
-        self.node = node ?? Self.node
+    public init(type: `Type`? = nil,
+                name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute]? = nil,
+                _ children: [Tag]? = nil) {
+        self.type = type ?? Self.type
+        self.name = name ?? Self.name
+        self.contents = contents
+        self.attributes = attributes
         self.children = children
     }
-
-    /// initialize a new Tag with a single child tag
-    public convenience init(node: Node? = nil, _ child: Tag) {
-        self.init(node: node, [child])
+    
+    public convenience init(type: `Type`? = nil,
+                            name: String? = nil,
+                            contents: String? = nil,
+                            attributes: [Attribute]? = nil,
+                            _ child: Tag) {
+        self.init(type: type,
+                  name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  [child])
     }
-
-    /// initialize a new Tag with children using a builder
-    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
-        self.init(node: node, [builder()])
+    
+    public convenience init(type: `Type` = .renderless,
+                            name: String? = nil,
+                            contents: String? = nil,
+                            attributes: [Attribute]? = nil,
+                            @TagBuilder _ builder: () -> Tag) {
+        self.init(type: type,
+                  name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  [builder()])
     }
     
-    /// initialize a new Tag with some contents
-    public convenience init(node: Node? = nil, _ contents: String?) {
-        self.init(node: node)
-        if let contents = contents {
-            setContents(contents)
-        }
+    public convenience init(_ contents: String) {
+        self.init(contents: contents)
     }
 
     // MARK: - contents
@@ -49,20 +71,29 @@ open class Tag {
     /// set contents
     @discardableResult
     public func setContents(_ value: String?, _ condition: Bool = true) -> Self {
-        if condition {
-            node.contents = value
-        }
+        contents = condition ? value : contents
         return self
     }
 
     // MARK: - attributes
     
+    /// add or replace an attribute with a given key to the node
+    private func upsert(_ attribute: Attribute) {
+        delete(attribute)
+        self.attributes = self.attributes ?? []
+        self.attributes?.append(attribute)
+    }
+
+    /// deletes a attribute with a given key from the node
+    private func delete(_ attribute: Attribute) {
+        guard let attributes = attributes else { return }
+        self.attributes = attributes.filter { $0.key != attribute.key }
+    }
+    
     /// set attributes
     @discardableResult
-    public func setAttributes(_ attributes: [Attribute], _ condition: Bool = true) -> Self {
-        if condition {
-            node.attributes = attributes
-        }
+    public func setAttributes(_ new: [Attribute], _ condition: Bool = true) -> Self {
+        self.attributes = condition ? new : attributes
         return self
     }
     
@@ -70,7 +101,7 @@ open class Tag {
     @discardableResult
     public func deleteAttribute(_ key: String, _ condition: Bool = true) -> Self {
         if condition {
-            node.delete(Attribute(key: key))
+            delete(Attribute(key: key))
         }
         return self
     }
@@ -79,7 +110,7 @@ open class Tag {
     @discardableResult
     public func attribute(_ key: String, _ value: String?, _ condition: Bool = true) -> Self {
         if let value = value, condition {
-            node.upsert(Attribute(key: key, value: value))
+            upsert(Attribute(key: key, value: value))
         }
         return self
     }
@@ -91,7 +122,7 @@ open class Tag {
     @discardableResult
     public func flagAttribute(_ key: String, _ value: String? = nil, _ condition: Bool = true) -> Self {
         if condition {
-            node.upsert(Attribute(key: key, value: value))
+            upsert(Attribute(key: key, value: value))
         }
         return self
     }
diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index 60f7ef7..f816e7c 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -10,19 +10,19 @@
 public enum TagBuilder {
     
     public static func buildBlock() -> Tag {
-        GroupTag()
+        Tag()
     }
     
     public static func buildBlock(_ components: [Tag]...) -> Tag {
-        GroupTag(components.flatMap { $0 })
+        Tag(components.flatMap { $0 })
     }
     
     public static func buildBlock(_ components: Tag...) -> Tag {
-        GroupTag(components)
+        Tag(components)
     }
     
     public static func buildOptional(_ component: Tag?) -> Tag {
-        component ?? GroupTag()
+        component ?? Tag()
     }
     
     public static func buildEither(first component: Tag) -> Tag {
@@ -34,6 +34,6 @@ public enum TagBuilder {
     }
     
     public static func buildArray(_ components: [Tag]) -> Tag {
-        GroupTag(components)
+        Tag(components)
     }
 }
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index ba20a8f..dcbd785 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -1,55 +1,46 @@
 //
-//  TypedTag.swift
+//  File.swift
 //  
 //
-//  Created by Brad Gourley on 7/10/23.
+//  Created by Brad Gourley on 7/12/23.
 //
 
-//  Base class for all tags with a particular node type.
-//
-//  In most cases, it is more appropriate to subclass the parent class Tag
-//
-//  or one of the superclasses: StandardTag, GroupTag, EmptyTag, CommentTag.
-//
-//  Subclasses only need to override the 'type' var
-
-
 open class TypedTag: Tag {
     
-    open class var type: Node.NodeType { .standard }
-    
-    private class func node(name: String? = nil,
-                            contents: String? = nil,
-                            attributes: [Attribute] = []) -> Node {
-        Node(type: Self.type, name: name ?? Self.name, contents: contents, attributes: attributes)
-    }
+    override open class var type: `Type` { .renderless }
     
     public init(name: String? = nil,
                 contents: String? = nil,
-                attributes: [Attribute] = [],
-                _ children: [Tag] = []) {
-        let node = Self.node(name: name ?? Self.name, contents: contents, attributes: attributes)
-        super.init(node: node, children)
+                attributes: [Attribute]? = nil,
+                _ children: [Tag]? = nil) {
+        super.init(name: name,
+                   contents: contents,
+                   attributes: attributes,
+                   children)
     }
     
     public convenience init(name: String? = nil,
                             contents: String? = nil,
-                            attributes: [Attribute] = [],
+                            attributes: [Attribute]? = nil,
                             _ child: Tag) {
-        self.init(name: name, contents: contents, attributes: attributes, [child])
+        self.init(name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  [child])
     }
     
     public convenience init(name: String? = nil,
                             contents: String? = nil,
-                            attributes: [Attribute] = [],
+                            attributes: [Attribute]? = nil,
                             @TagBuilder _ builder: () -> Tag) {
-        self.init(name: name, contents: contents, attributes: attributes, [builder()])
+        self.init(name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  [builder()])
     }
     
-    public convenience init(name: String? = nil,
-                            attributes: [Attribute] = [],
-                            _ contents: String?) {
-        
-        self.init(name: name, contents: contents, attributes: attributes)
+    public convenience init(_ contents: String) {
+        self.init(contents: contents)
     }
 }
+
diff --git a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
index 481f9b0..3c32d6c 100644
--- a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
+++ b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
@@ -228,7 +228,7 @@ final class SwiftHtmlTests: XCTestCase {
         let doc = Document {
             Div {
                 values.map { item -> Tag in
-                    GroupTag {
+                    Tag {
                         H1(item)
                         P(item)
                     }
diff --git a/Tests/SwiftSgmlTests/TagBuilderTests.swift b/Tests/SwiftSgmlTests/TagBuilderTests.swift
index e17fc31..14b50cb 100644
--- a/Tests/SwiftSgmlTests/TagBuilderTests.swift
+++ b/Tests/SwiftSgmlTests/TagBuilderTests.swift
@@ -153,10 +153,8 @@ final class TagBuilderTests: XCTestCase {
     func testGroupTagBuilderAndRenderer() {
         let doc = Document {
             Branch {
-                GroupTag {
-                    Leaf("a")
-                    Leaf("b")
-                }
+                Leaf("a")
+                Leaf("b")
             }
         }
         
@@ -175,7 +173,7 @@ final class TagBuilderTests: XCTestCase {
         let doc = Document {
             Branch {
                 values.map { item -> Tag in
-                    GroupTag {
+                    Tag {
                         Leaf(item)
                         Leaf(item)
                     }

From 94f647254b3196b30653cc46aa388fbda9c3d938 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 12 Jul 2023 12:50:39 -0400
Subject: [PATCH 069/141] Update to match changes to Tag

---
 README.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3a7a709..8dfb354 100644
--- a/README.md
+++ b/README.md
@@ -95,12 +95,12 @@ class MyTag: Tag {
 // <myTag></myTag>
 ```
 
-3. Subclass `Tag` and override the `node` property. The `Node` determines how your class will render. For example, to create an empty tag...
+3. Subclass `Tag` and override the `type` property. `Type` determines how your class will render. For example, to create an empty tag...
 
 ```swift
 class MyTag: Tag {
     
-    override open class var node: Node { .init(type: .empty, name: "myTag") }
+    override open class var type: `Type` { .empty }
 }
 
 // <myTag>
@@ -113,8 +113,11 @@ class MyTag: Tag {
 
     init(myAttributeValue: String, @TagBuilder _ builder: () -> Tag) {
         let attribute = .init(key: "myKey", value: myAttributeValue)
-        let node = Node(type: .empty, name: "myTag", attributes: [attribute])
-        super.init(node: node, [builder()])
+        super.init(type: .empty,
+                   name: "myTag",
+                   attributes: [attribute],
+                   builder: [builder()]
+        )
     }
 }
 

From fa127cd5df276717856cfb334cc7250406e2f9c6 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 12 Jul 2023 12:59:32 -0400
Subject: [PATCH 070/141] Update .renderless to .onlyChildren

---
 Sources/SwiftSgml/DocumentRenderer.swift | 2 +-
 Sources/SwiftSgml/Tag.swift              | 6 +++---
 Sources/SwiftSgml/TypedTag.swift         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index b7acdfc..0a046b9 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -45,7 +45,7 @@ public struct DocumentRenderer {
             return spaces + renderOpening(tag)
         case .standard:
             return spaces + renderOpening(tag) + (tag.contents ?? "") + renderChildren(tag, level: level, spaces: spaces) + renderClosing(tag)
-        case .renderless:
+        case .onlyChildren:
             var contents = ""
             if let rawValue = tag.contents {
                 contents = spaces + rawValue
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 9b275f8..4953816 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -12,7 +12,7 @@ open class Tag {
     public enum `Type` {
         case comment    // <!-- -->
         case empty      // <name>
-        case renderless // no tag
+        case onlyChildren // only children render
         case standard   // <name></name>
     }
     
@@ -22,7 +22,7 @@ open class Tag {
     public internal(set) var attributes: [Attribute]?
     public private(set) var children: [Tag]?
     
-    open class var type: `Type` { .renderless }
+    open class var type: `Type` { .onlyChildren }
     open class var name: String { .init(self).lowercased() }
         
     // MARK: - init
@@ -50,7 +50,7 @@ open class Tag {
                   [child])
     }
     
-    public convenience init(type: `Type` = .renderless,
+    public convenience init(type: `Type` = .onlyChildren,
                             name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute]? = nil,
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index dcbd785..b19bd04 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -7,7 +7,7 @@
 
 open class TypedTag: Tag {
     
-    override open class var type: `Type` { .renderless }
+    override open class var type: `Type` { .onlyChildren }
     
     public init(name: String? = nil,
                 contents: String? = nil,

From c6f182f97546c8cc7ff9aa1257d79a47c17782a2 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:27:03 -0400
Subject: [PATCH 071/141] Tag type is optional

---
 Sources/SwiftSgml/DocumentRenderer.swift | 18 ++++++++++--------
 Sources/SwiftSgml/EmptyTag.swift         |  2 +-
 Sources/SwiftSgml/StandardTag.swift      |  2 +-
 Sources/SwiftSgml/Tag.swift              |  7 +++----
 Sources/SwiftSgml/TypedTag.swift         |  2 --
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index 0a046b9..a8c9522 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -38,14 +38,16 @@ public struct DocumentRenderer {
 
     private func render(tag: Tag, level: Int = 0) -> String {
         let spaces = String(repeating: " ", count: level * indent)
-        switch tag.type {
-        case .comment:
-            return spaces + "<!-- " + (tag.contents ?? "") + " -->"
-        case .empty:
-            return spaces + renderOpening(tag)
-        case .standard:
-            return spaces + renderOpening(tag) + (tag.contents ?? "") + renderChildren(tag, level: level, spaces: spaces) + renderClosing(tag)
-        case .onlyChildren:
+        if let type = tag.type {
+            switch type {
+            case .comment:
+                return spaces + "<!-- " + (tag.contents ?? "") + " -->"
+            case .empty:
+                return spaces + renderOpening(tag)
+            case .standard:
+                return spaces + renderOpening(tag) + (tag.contents ?? "") + renderChildren(tag, level: level, spaces: spaces) + renderClosing(tag)
+            }
+        } else {
             var contents = ""
             if let rawValue = tag.contents {
                 contents = spaces + rawValue
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index f5c09cc..b5904ea 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -7,5 +7,5 @@
 
 open class EmptyTag: TypedTag {
     
-    override open class var type: `Type` { .empty }
+    override open class var type: `Type`? { .empty }
 }
diff --git a/Sources/SwiftSgml/StandardTag.swift b/Sources/SwiftSgml/StandardTag.swift
index 2881d61..a969b93 100644
--- a/Sources/SwiftSgml/StandardTag.swift
+++ b/Sources/SwiftSgml/StandardTag.swift
@@ -7,5 +7,5 @@
 
 open class StandardTag: TypedTag {
     
-    override open class var type: `Type` { .standard }
+    override open class var type: `Type`? { .standard }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 4953816..5edc0e0 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -12,17 +12,16 @@ open class Tag {
     public enum `Type` {
         case comment    // <!-- -->
         case empty      // <name>
-        case onlyChildren // only children render
         case standard   // <name></name>
     }
     
-    public let type: `Type`
+    public let type: `Type`?
     public let name: String
     public var contents: String?
     public internal(set) var attributes: [Attribute]?
     public private(set) var children: [Tag]?
     
-    open class var type: `Type` { .onlyChildren }
+    open class var type: `Type`? { nil }
     open class var name: String { .init(self).lowercased() }
         
     // MARK: - init
@@ -50,7 +49,7 @@ open class Tag {
                   [child])
     }
     
-    public convenience init(type: `Type` = .onlyChildren,
+    public convenience init(type: `Type`? = nil,
                             name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute]? = nil,
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index b19bd04..a358a71 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -7,8 +7,6 @@
 
 open class TypedTag: Tag {
     
-    override open class var type: `Type` { .onlyChildren }
-    
     public init(name: String? = nil,
                 contents: String? = nil,
                 attributes: [Attribute]? = nil,

From f40bb1e37f974c81af1eea511ceb42cf59b6d6a1 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:32:40 -0400
Subject: [PATCH 072/141] Node has been eliminated

---
 Sources/SwiftSgml/Node.swift | 53 ------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 Sources/SwiftSgml/Node.swift

diff --git a/Sources/SwiftSgml/Node.swift b/Sources/SwiftSgml/Node.swift
deleted file mode 100644
index 93d2698..0000000
--- a/Sources/SwiftSgml/Node.swift
+++ /dev/null
@@ -1,53 +0,0 @@
-////
-////  Node.swift
-////  SwiftSgml
-////
-////  Created by Tibor Bodecs on 2021. 07. 19..
-////
-//
-//public struct Node {
-//
-//    /// internal node types
-//    public enum NodeType {
-//        /// standard container tags
-//        case standard     // <div>  </div>
-//        /// comment tag
-//        case comment      // <!--   -->
-//        // @TODO: force close tags? <br> vs <br/>
-//        /// non-container tags
-//        case empty        // <br>
-//        /// invisible node for grouping other nodes
-//        case group    // *invisible group*<h1>lorem</h1><p>ipsum</p>*invisible group*
-//    }
-//
-//    public let type: NodeType
-//    public let name: String
-//    public var contents: String?
-//    public internal(set) var attributes: [Attribute]
-//
-//    public init(type: NodeType = .standard,
-//         name: String,
-//         contents: String? = nil,
-//         attributes: [Attribute] = []
-//    ) {
-//        self.type = type
-//        self.name = name
-//        self.contents = contents
-//        self.attributes = attributes
-//    }
-//}
-//
-//public extension Node {
-//    
-//    /// add or replace an attribute with a given key to the node
-//    mutating func upsert(_ attribute: Attribute) {
-//        delete(attribute)
-//        attributes.append(attribute)
-//    }
-//
-//    /// deletes a attribute with a given key from the node
-//    mutating func delete(_ attribute: Attribute) {
-//        attributes = attributes.filter { $0.key != attribute.key }
-//    }
-//}
-//

From da8dfb7ef86a975369ba77409784bc87025601cd Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:45:43 -0400
Subject: [PATCH 073/141] Comment

---
 Sources/SwiftSgml/Tag.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 5edc0e0..37fba05 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -15,7 +15,7 @@ open class Tag {
         case standard   // <name></name>
     }
     
-    public let type: `Type`?
+    public let type: `Type`?    // type == nil only children rendered
     public let name: String
     public var contents: String?
     public internal(set) var attributes: [Attribute]?

From a64cf46a2a9fbf8d650bc483b2a5ab0deb944a95 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:52:37 -0400
Subject: [PATCH 074/141] Tag default initializer uses builder func so
 subclasses look cleaner.

---
 Sources/SwiftSgml/CommentTag.swift |  2 +-
 Sources/SwiftSgml/TypedTag.swift   | 30 +++++-------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/Sources/SwiftSgml/CommentTag.swift b/Sources/SwiftSgml/CommentTag.swift
index bd65503..941073f 100644
--- a/Sources/SwiftSgml/CommentTag.swift
+++ b/Sources/SwiftSgml/CommentTag.swift
@@ -7,5 +7,5 @@
 
 open class CommentTag: TypedTag {
         
-    override open class var type: `Type` { .comment }    
+    override open class var type: `Type`? { .comment }    
 }
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index a358a71..f57ed8f 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  TypedTag.swift
 //  
 //
 //  Created by Brad Gourley on 7/12/23.
@@ -10,35 +10,15 @@ open class TypedTag: Tag {
     public init(name: String? = nil,
                 contents: String? = nil,
                 attributes: [Attribute]? = nil,
-                _ children: [Tag]? = nil) {
+                @TagBuilder _ builder: () -> Tag) {
         super.init(name: name,
                    contents: contents,
                    attributes: attributes,
-                   children)
+                   [builder()])
     }
-    
-    public convenience init(name: String? = nil,
-                            contents: String? = nil,
-                            attributes: [Attribute]? = nil,
-                            _ child: Tag) {
-        self.init(name: name,
-                  contents: contents,
-                  attributes: attributes,
-                  [child])
-    }
-    
-    public convenience init(name: String? = nil,
-                            contents: String? = nil,
-                            attributes: [Attribute]? = nil,
-                            @TagBuilder _ builder: () -> Tag) {
-        self.init(name: name,
-                  contents: contents,
-                  attributes: attributes,
-                  [builder()])
-    }
-    
+        
     public convenience init(_ contents: String) {
-        self.init(contents: contents)
+        self.init(contents: contents) {}
     }
 }
 

From a33eb6b8d0bbe8541cd275b9ca7cb6c127f06ded Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:12:51 -0400
Subject: [PATCH 075/141] Tag is renderless (#1)

---
 README.md                                  | 11 ++-
 Sources/SwiftHtml/Attributes/Global.swift  |  4 +-
 Sources/SwiftHtml/Tags/Article.swift       |  6 --
 Sources/SwiftHtml/Text.swift               |  2 +-
 Sources/SwiftSgml/CommentTag.swift         |  2 +-
 Sources/SwiftSgml/DocumentRenderer.swift   | 30 ++++---
 Sources/SwiftSgml/EmptyTag.swift           |  2 +-
 Sources/SwiftSgml/GroupTag.swift           | 11 ---
 Sources/SwiftSgml/Node.swift               | 53 ------------
 Sources/SwiftSgml/StandardTag.swift        |  2 +-
 Sources/SwiftSgml/Tag.swift                | 98 ++++++++++++++--------
 Sources/SwiftSgml/TagBuilder.swift         | 10 +--
 Sources/SwiftSgml/TypedTag.swift           | 51 +++--------
 Tests/SwiftHtmlTests/SwiftHtmlTests.swift  |  2 +-
 Tests/SwiftSgmlTests/TagBuilderTests.swift |  8 +-
 15 files changed, 113 insertions(+), 179 deletions(-)
 delete mode 100644 Sources/SwiftSgml/GroupTag.swift
 delete mode 100644 Sources/SwiftSgml/Node.swift

diff --git a/README.md b/README.md
index 3a7a709..8dfb354 100644
--- a/README.md
+++ b/README.md
@@ -95,12 +95,12 @@ class MyTag: Tag {
 // <myTag></myTag>
 ```
 
-3. Subclass `Tag` and override the `node` property. The `Node` determines how your class will render. For example, to create an empty tag...
+3. Subclass `Tag` and override the `type` property. `Type` determines how your class will render. For example, to create an empty tag...
 
 ```swift
 class MyTag: Tag {
     
-    override open class var node: Node { .init(type: .empty, name: "myTag") }
+    override open class var type: `Type` { .empty }
 }
 
 // <myTag>
@@ -113,8 +113,11 @@ class MyTag: Tag {
 
     init(myAttributeValue: String, @TagBuilder _ builder: () -> Tag) {
         let attribute = .init(key: "myKey", value: myAttributeValue)
-        let node = Node(type: .empty, name: "myTag", attributes: [attribute])
-        super.init(node: node, [builder()])
+        super.init(type: .empty,
+                   name: "myTag",
+                   attributes: [attribute],
+                   builder: [builder()]
+        )
     }
 }
 
diff --git a/Sources/SwiftHtml/Attributes/Global.swift b/Sources/SwiftHtml/Attributes/Global.swift
index 1daf2ca..c1265f5 100644
--- a/Sources/SwiftHtml/Attributes/Global.swift
+++ b/Sources/SwiftHtml/Attributes/Global.swift
@@ -61,7 +61,7 @@ public extension Tag {
 
     /// find an existing class attribute and return the value as an array of strings or an empty array
     private var classArray: [String] {
-        node.attributes.first { $0.key == "class" }?.value?.classArray ?? []
+        attributes?.first { $0.key == "class" }?.value?.classArray ?? []
     }
 
     /// Specifies one classname for an element (refers to a class in a style sheet)
@@ -137,7 +137,7 @@ public extension Tag {
 
     /// find an existing style attribute and return the value as an array of strings or an empty array
     private var styleArray: [String] {
-        node.attributes.first { $0.key == "style" }?.value?.styleArray ?? []
+        attributes?.first { $0.key == "style" }?.value?.styleArray ?? []
     }
 
     /// Specifies one stylename for an element (refers to a style in a style sheet)
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index b45b09c..87eaf45 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -5,12 +5,6 @@
 //  Created by Tibor Bodecs on 2021. 07. 19..
 //
 
-public extension Node {
-
-    static func article() -> Node {
-        Node(type: .standard, name: "article")
-    }
-}
 
 /// The `<article>` tag specifies independent, self-contained content.
 ///
diff --git a/Sources/SwiftHtml/Text.swift b/Sources/SwiftHtml/Text.swift
index c982ddf..1c34a5f 100644
--- a/Sources/SwiftHtml/Text.swift
+++ b/Sources/SwiftHtml/Text.swift
@@ -6,7 +6,7 @@
 //
 
 /// a plain text node to write simple textual content into the html tree
-open class Text: GroupTag {
+open class Text: Tag {
 
   public init(_ contents: String) {
          super.init()
diff --git a/Sources/SwiftSgml/CommentTag.swift b/Sources/SwiftSgml/CommentTag.swift
index 61a6057..941073f 100644
--- a/Sources/SwiftSgml/CommentTag.swift
+++ b/Sources/SwiftSgml/CommentTag.swift
@@ -7,5 +7,5 @@
 
 open class CommentTag: TypedTag {
         
-    override open class var type: Node.NodeType { .comment }    
+    override open class var type: `Type`? { .comment }    
 }
diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index 3a41cd5..a8c9522 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -38,16 +38,18 @@ public struct DocumentRenderer {
 
     private func render(tag: Tag, level: Int = 0) -> String {
         let spaces = String(repeating: " ", count: level * indent)
-        switch tag.node.type {
-        case .standard:
-            return spaces + renderOpening(tag) + (tag.node.contents ?? "") + renderChildren(tag, level: level, spaces: spaces) + renderClosing(tag)
-        case .comment:
-            return spaces + "<!-- " + (tag.node.contents ?? "") + " -->"
-        case .empty:
-            return spaces + renderOpening(tag)
-        case .group:
+        if let type = tag.type {
+            switch type {
+            case .comment:
+                return spaces + "<!-- " + (tag.contents ?? "") + " -->"
+            case .empty:
+                return spaces + renderOpening(tag)
+            case .standard:
+                return spaces + renderOpening(tag) + (tag.contents ?? "") + renderChildren(tag, level: level, spaces: spaces) + renderClosing(tag)
+            }
+        } else {
             var contents = ""
-            if let rawValue = tag.node.contents {
+            if let rawValue = tag.contents {
                 contents = spaces + rawValue
             }
             return contents + renderChildren(tag, level: level, spaces: spaces, isGrouped: true)
@@ -59,7 +61,8 @@ public struct DocumentRenderer {
         if isGrouped {
             newLevel = level
         }
-        var children = tag.children.map { render(tag: $0, level: newLevel) }.joined(separator: newline)
+        let tagChildren = tag.children ?? []
+        var children = tagChildren.map { render(tag: $0, level: newLevel) }.joined(separator: newline)
         if !children.isEmpty {
             if !isGrouped {
                 children = newline + children + newline + spaces
@@ -69,15 +72,16 @@ public struct DocumentRenderer {
     }
     
     private func renderOpening(_ tag: Tag) -> String {
-        return "<" + tag.node.name + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
+        let attributes = tag.attributes ?? []
+        return "<" + tag.name + (attributes.isEmpty ? "" : " ") + renderAttributes(attributes) + ">"
     }
     
     private func renderClosing(_ tag: Tag) -> String {
-        "</" + tag.node.name + ">"
+        "</" + tag.name + ">"
     }
 
     private func renderAttributes(_ attributes: [Attribute]) -> String {
-        return attributes.reduce([]) { res, next in
+        attributes.reduce([]) { res, next in
             if let value = next.value {
                 return res + [next.key + #"=""# + value + #"""#]
             }
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index 649a243..b5904ea 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -7,5 +7,5 @@
 
 open class EmptyTag: TypedTag {
     
-    override open class var type: Node.NodeType { .empty }
+    override open class var type: `Type`? { .empty }
 }
diff --git a/Sources/SwiftSgml/GroupTag.swift b/Sources/SwiftSgml/GroupTag.swift
deleted file mode 100644
index eeee847..0000000
--- a/Sources/SwiftSgml/GroupTag.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-//  GroupTag.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 02. 11..
-//
-
-open class GroupTag: TypedTag {
-        
-    override open class var type: Node.NodeType { .group }
-}
diff --git a/Sources/SwiftSgml/Node.swift b/Sources/SwiftSgml/Node.swift
deleted file mode 100644
index 8094d7d..0000000
--- a/Sources/SwiftSgml/Node.swift
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//  Node.swift
-//  SwiftSgml
-//
-//  Created by Tibor Bodecs on 2021. 07. 19..
-//
-
-public struct Node {
-
-    /// internal node types
-    public enum NodeType {
-        /// standard container tags
-        case standard     // <div>  </div>
-        /// comment tag
-        case comment      // <!--   -->
-        // @TODO: force close tags? <br> vs <br/>
-        /// non-container tags
-        case empty        // <br>
-        /// invisible node for grouping other nodes
-        case group    // *invisible group*<h1>lorem</h1><p>ipsum</p>*invisible group*
-    }
-
-    public let type: NodeType
-    public let name: String
-    public var contents: String?
-    public internal(set) var attributes: [Attribute]
-
-    public init(type: NodeType = .standard,
-         name: String,
-         contents: String? = nil,
-         attributes: [Attribute] = []
-    ) {
-        self.type = type
-        self.name = name
-        self.contents = contents
-        self.attributes = attributes
-    }
-}
-
-public extension Node {
-    
-    /// add or replace an attribute with a given key to the node
-    mutating func upsert(_ attribute: Attribute) {
-        delete(attribute)
-        attributes.append(attribute)
-    }
-
-    /// deletes a attribute with a given key from the node
-    mutating func delete(_ attribute: Attribute) {
-        attributes = attributes.filter { $0.key != attribute.key }
-    }
-}
-
diff --git a/Sources/SwiftSgml/StandardTag.swift b/Sources/SwiftSgml/StandardTag.swift
index c6b8ff5..a969b93 100644
--- a/Sources/SwiftSgml/StandardTag.swift
+++ b/Sources/SwiftSgml/StandardTag.swift
@@ -7,5 +7,5 @@
 
 open class StandardTag: TypedTag {
     
-    override open class var type: Node.NodeType { .standard }
+    override open class var type: `Type`? { .standard }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index c48cbb9..37fba05 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -9,39 +9,60 @@
 
 open class Tag {
     
-    // override to implement a default Node
-    open class var node: Node { .init(type: .standard, name: Self.name) }
+    public enum `Type` {
+        case comment    // <!-- -->
+        case empty      // <name>
+        case standard   // <name></name>
+    }
+    
+    public let type: `Type`?    // type == nil only children rendered
+    public let name: String
+    public var contents: String?
+    public internal(set) var attributes: [Attribute]?
+    public private(set) var children: [Tag]?
     
-    // override to customize the <tag_name>
+    open class var type: `Type`? { nil }
     open class var name: String { .init(self).lowercased() }
-
-    public private(set) var node: Node
-    public private(set) var children: [Tag]
         
     // MARK: - init
-        
-    /// initialize a new Tag with child tags
-    public init(node: Node? = nil, _ children: [Tag] = []) {
-        self.node = node ?? Self.node
+    public init(type: `Type`? = nil,
+                name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute]? = nil,
+                _ children: [Tag]? = nil) {
+        self.type = type ?? Self.type
+        self.name = name ?? Self.name
+        self.contents = contents
+        self.attributes = attributes
         self.children = children
     }
-
-    /// initialize a new Tag with a single child tag
-    public convenience init(node: Node? = nil, _ child: Tag) {
-        self.init(node: node, [child])
+    
+    public convenience init(type: `Type`? = nil,
+                            name: String? = nil,
+                            contents: String? = nil,
+                            attributes: [Attribute]? = nil,
+                            _ child: Tag) {
+        self.init(type: type,
+                  name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  [child])
     }
-
-    /// initialize a new Tag with children using a builder
-    public convenience init(node: Node? = nil, @TagBuilder _ builder: () -> Tag) {
-        self.init(node: node, [builder()])
+    
+    public convenience init(type: `Type`? = nil,
+                            name: String? = nil,
+                            contents: String? = nil,
+                            attributes: [Attribute]? = nil,
+                            @TagBuilder _ builder: () -> Tag) {
+        self.init(type: type,
+                  name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  [builder()])
     }
     
-    /// initialize a new Tag with some contents
-    public convenience init(node: Node? = nil, _ contents: String?) {
-        self.init(node: node)
-        if let contents = contents {
-            setContents(contents)
-        }
+    public convenience init(_ contents: String) {
+        self.init(contents: contents)
     }
 
     // MARK: - contents
@@ -49,20 +70,29 @@ open class Tag {
     /// set contents
     @discardableResult
     public func setContents(_ value: String?, _ condition: Bool = true) -> Self {
-        if condition {
-            node.contents = value
-        }
+        contents = condition ? value : contents
         return self
     }
 
     // MARK: - attributes
     
+    /// add or replace an attribute with a given key to the node
+    private func upsert(_ attribute: Attribute) {
+        delete(attribute)
+        self.attributes = self.attributes ?? []
+        self.attributes?.append(attribute)
+    }
+
+    /// deletes a attribute with a given key from the node
+    private func delete(_ attribute: Attribute) {
+        guard let attributes = attributes else { return }
+        self.attributes = attributes.filter { $0.key != attribute.key }
+    }
+    
     /// set attributes
     @discardableResult
-    public func setAttributes(_ attributes: [Attribute], _ condition: Bool = true) -> Self {
-        if condition {
-            node.attributes = attributes
-        }
+    public func setAttributes(_ new: [Attribute], _ condition: Bool = true) -> Self {
+        self.attributes = condition ? new : attributes
         return self
     }
     
@@ -70,7 +100,7 @@ open class Tag {
     @discardableResult
     public func deleteAttribute(_ key: String, _ condition: Bool = true) -> Self {
         if condition {
-            node.delete(Attribute(key: key))
+            delete(Attribute(key: key))
         }
         return self
     }
@@ -79,7 +109,7 @@ open class Tag {
     @discardableResult
     public func attribute(_ key: String, _ value: String?, _ condition: Bool = true) -> Self {
         if let value = value, condition {
-            node.upsert(Attribute(key: key, value: value))
+            upsert(Attribute(key: key, value: value))
         }
         return self
     }
@@ -91,7 +121,7 @@ open class Tag {
     @discardableResult
     public func flagAttribute(_ key: String, _ value: String? = nil, _ condition: Bool = true) -> Self {
         if condition {
-            node.upsert(Attribute(key: key, value: value))
+            upsert(Attribute(key: key, value: value))
         }
         return self
     }
diff --git a/Sources/SwiftSgml/TagBuilder.swift b/Sources/SwiftSgml/TagBuilder.swift
index 60f7ef7..f816e7c 100644
--- a/Sources/SwiftSgml/TagBuilder.swift
+++ b/Sources/SwiftSgml/TagBuilder.swift
@@ -10,19 +10,19 @@
 public enum TagBuilder {
     
     public static func buildBlock() -> Tag {
-        GroupTag()
+        Tag()
     }
     
     public static func buildBlock(_ components: [Tag]...) -> Tag {
-        GroupTag(components.flatMap { $0 })
+        Tag(components.flatMap { $0 })
     }
     
     public static func buildBlock(_ components: Tag...) -> Tag {
-        GroupTag(components)
+        Tag(components)
     }
     
     public static func buildOptional(_ component: Tag?) -> Tag {
-        component ?? GroupTag()
+        component ?? Tag()
     }
     
     public static func buildEither(first component: Tag) -> Tag {
@@ -34,6 +34,6 @@ public enum TagBuilder {
     }
     
     public static func buildArray(_ components: [Tag]) -> Tag {
-        GroupTag(components)
+        Tag(components)
     }
 }
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index ba20a8f..f57ed8f 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -2,54 +2,23 @@
 //  TypedTag.swift
 //  
 //
-//  Created by Brad Gourley on 7/10/23.
+//  Created by Brad Gourley on 7/12/23.
 //
 
-//  Base class for all tags with a particular node type.
-//
-//  In most cases, it is more appropriate to subclass the parent class Tag
-//
-//  or one of the superclasses: StandardTag, GroupTag, EmptyTag, CommentTag.
-//
-//  Subclasses only need to override the 'type' var
-
-
 open class TypedTag: Tag {
     
-    open class var type: Node.NodeType { .standard }
-    
-    private class func node(name: String? = nil,
-                            contents: String? = nil,
-                            attributes: [Attribute] = []) -> Node {
-        Node(type: Self.type, name: name ?? Self.name, contents: contents, attributes: attributes)
-    }
-    
     public init(name: String? = nil,
                 contents: String? = nil,
-                attributes: [Attribute] = [],
-                _ children: [Tag] = []) {
-        let node = Self.node(name: name ?? Self.name, contents: contents, attributes: attributes)
-        super.init(node: node, children)
-    }
-    
-    public convenience init(name: String? = nil,
-                            contents: String? = nil,
-                            attributes: [Attribute] = [],
-                            _ child: Tag) {
-        self.init(name: name, contents: contents, attributes: attributes, [child])
+                attributes: [Attribute]? = nil,
+                @TagBuilder _ builder: () -> Tag) {
+        super.init(name: name,
+                   contents: contents,
+                   attributes: attributes,
+                   [builder()])
     }
-    
-    public convenience init(name: String? = nil,
-                            contents: String? = nil,
-                            attributes: [Attribute] = [],
-                            @TagBuilder _ builder: () -> Tag) {
-        self.init(name: name, contents: contents, attributes: attributes, [builder()])
-    }
-    
-    public convenience init(name: String? = nil,
-                            attributes: [Attribute] = [],
-                            _ contents: String?) {
         
-        self.init(name: name, contents: contents, attributes: attributes)
+    public convenience init(_ contents: String) {
+        self.init(contents: contents) {}
     }
 }
+
diff --git a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
index 481f9b0..3c32d6c 100644
--- a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
+++ b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
@@ -228,7 +228,7 @@ final class SwiftHtmlTests: XCTestCase {
         let doc = Document {
             Div {
                 values.map { item -> Tag in
-                    GroupTag {
+                    Tag {
                         H1(item)
                         P(item)
                     }
diff --git a/Tests/SwiftSgmlTests/TagBuilderTests.swift b/Tests/SwiftSgmlTests/TagBuilderTests.swift
index e17fc31..14b50cb 100644
--- a/Tests/SwiftSgmlTests/TagBuilderTests.swift
+++ b/Tests/SwiftSgmlTests/TagBuilderTests.swift
@@ -153,10 +153,8 @@ final class TagBuilderTests: XCTestCase {
     func testGroupTagBuilderAndRenderer() {
         let doc = Document {
             Branch {
-                GroupTag {
-                    Leaf("a")
-                    Leaf("b")
-                }
+                Leaf("a")
+                Leaf("b")
             }
         }
         
@@ -175,7 +173,7 @@ final class TagBuilderTests: XCTestCase {
         let doc = Document {
             Branch {
                 values.map { item -> Tag in
-                    GroupTag {
+                    Tag {
                         Leaf(item)
                         Leaf(item)
                     }

From 85e605c9d861f75c9c6805b45c6ffe623e1aa42b Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:30:29 -0400
Subject: [PATCH 076/141] Second designated initializer with builder parameter
 so Tag is easier to subclass.

---
 Sources/SwiftSgml/Tag.swift      | 25 ++++++++++----------
 Sources/SwiftSgml/TypedTag.swift | 39 ++++++++++++++++++++++++++++----
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 37fba05..acd4ddd 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -37,28 +37,29 @@ open class Tag {
         self.children = children
     }
     
-    public convenience init(type: `Type`? = nil,
-                            name: String? = nil,
-                            contents: String? = nil,
-                            attributes: [Attribute]? = nil,
-                            _ child: Tag) {
-        self.init(type: type,
-                  name: name,
-                  contents: contents,
-                  attributes: attributes,
-                  [child])
+    // alternate designated initializer with builder parameter to make subclassing easier
+    public init(type: `Type`? = nil,
+                name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute]? = nil,
+                @TagBuilder _ builder: () -> Tag) {
+        self.type = type ?? Self.type
+        self.name = name ?? Self.name
+        self.contents = contents
+        self.attributes = attributes
+        self.children = [builder()]
     }
     
     public convenience init(type: `Type`? = nil,
                             name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute]? = nil,
-                            @TagBuilder _ builder: () -> Tag) {
+                            _ child: Tag) {
         self.init(type: type,
                   name: name,
                   contents: contents,
                   attributes: attributes,
-                  [builder()])
+                  [child])
     }
     
     public convenience init(_ contents: String) {
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index f57ed8f..9dc48e0 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -10,15 +10,46 @@ open class TypedTag: Tag {
     public init(name: String? = nil,
                 contents: String? = nil,
                 attributes: [Attribute]? = nil,
-                @TagBuilder _ builder: () -> Tag) {
+                _ children: [Tag]? = nil) {
         super.init(name: name,
                    contents: contents,
                    attributes: attributes,
-                   [builder()])
+                   children)
     }
-        
+    
+    // alternate designated initializer with builder parameter for subclassing convenience
+    public init(name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute]? = nil,
+                @TagBuilder _ builder: () -> Tag) {
+        super.init(name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  [builder()])
+    }
+    
+    public convenience init(name: String? = nil,
+                            contents: String? = nil,
+                            attributes: [Attribute]? = nil,
+                            _ child: Tag) {
+        self.init(name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  [child])
+    }
+    
+    public convenience init(name: String? = nil,
+                            contents: String? = nil,
+                            attributes: [Attribute]? = nil,
+                            @TagBuilder _ builder: () -> [Tag]) {
+        self.init(name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  builder())
+    }
+    
     public convenience init(_ contents: String) {
-        self.init(contents: contents) {}
+        self.init(contents: contents)
     }
 }
 

From 43225292cba88d7edf171a926199f1e91de5cdee Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:39:57 -0400
Subject: [PATCH 077/141] Node file

---
 Sources/SwiftSgml/Node.swift | 53 ++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 Sources/SwiftSgml/Node.swift

diff --git a/Sources/SwiftSgml/Node.swift b/Sources/SwiftSgml/Node.swift
new file mode 100644
index 0000000..93d2698
--- /dev/null
+++ b/Sources/SwiftSgml/Node.swift
@@ -0,0 +1,53 @@
+////
+////  Node.swift
+////  SwiftSgml
+////
+////  Created by Tibor Bodecs on 2021. 07. 19..
+////
+//
+//public struct Node {
+//
+//    /// internal node types
+//    public enum NodeType {
+//        /// standard container tags
+//        case standard     // <div>  </div>
+//        /// comment tag
+//        case comment      // <!--   -->
+//        // @TODO: force close tags? <br> vs <br/>
+//        /// non-container tags
+//        case empty        // <br>
+//        /// invisible node for grouping other nodes
+//        case group    // *invisible group*<h1>lorem</h1><p>ipsum</p>*invisible group*
+//    }
+//
+//    public let type: NodeType
+//    public let name: String
+//    public var contents: String?
+//    public internal(set) var attributes: [Attribute]
+//
+//    public init(type: NodeType = .standard,
+//         name: String,
+//         contents: String? = nil,
+//         attributes: [Attribute] = []
+//    ) {
+//        self.type = type
+//        self.name = name
+//        self.contents = contents
+//        self.attributes = attributes
+//    }
+//}
+//
+//public extension Node {
+//    
+//    /// add or replace an attribute with a given key to the node
+//    mutating func upsert(_ attribute: Attribute) {
+//        delete(attribute)
+//        attributes.append(attribute)
+//    }
+//
+//    /// deletes a attribute with a given key from the node
+//    mutating func delete(_ attribute: Attribute) {
+//        attributes = attributes.filter { $0.key != attribute.key }
+//    }
+//}
+//

From d63a14b45e4fecfe925374d91727a69781aedd48 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:44:23 -0400
Subject: [PATCH 078/141] Remove Node

---
 Sources/SwiftSgml/Node.swift | 53 ------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 Sources/SwiftSgml/Node.swift

diff --git a/Sources/SwiftSgml/Node.swift b/Sources/SwiftSgml/Node.swift
deleted file mode 100644
index 93d2698..0000000
--- a/Sources/SwiftSgml/Node.swift
+++ /dev/null
@@ -1,53 +0,0 @@
-////
-////  Node.swift
-////  SwiftSgml
-////
-////  Created by Tibor Bodecs on 2021. 07. 19..
-////
-//
-//public struct Node {
-//
-//    /// internal node types
-//    public enum NodeType {
-//        /// standard container tags
-//        case standard     // <div>  </div>
-//        /// comment tag
-//        case comment      // <!--   -->
-//        // @TODO: force close tags? <br> vs <br/>
-//        /// non-container tags
-//        case empty        // <br>
-//        /// invisible node for grouping other nodes
-//        case group    // *invisible group*<h1>lorem</h1><p>ipsum</p>*invisible group*
-//    }
-//
-//    public let type: NodeType
-//    public let name: String
-//    public var contents: String?
-//    public internal(set) var attributes: [Attribute]
-//
-//    public init(type: NodeType = .standard,
-//         name: String,
-//         contents: String? = nil,
-//         attributes: [Attribute] = []
-//    ) {
-//        self.type = type
-//        self.name = name
-//        self.contents = contents
-//        self.attributes = attributes
-//    }
-//}
-//
-//public extension Node {
-//    
-//    /// add or replace an attribute with a given key to the node
-//    mutating func upsert(_ attribute: Attribute) {
-//        delete(attribute)
-//        attributes.append(attribute)
-//    }
-//
-//    /// deletes a attribute with a given key from the node
-//    mutating func delete(_ attribute: Attribute) {
-//        attributes = attributes.filter { $0.key != attribute.key }
-//    }
-//}
-//

From 023aebc4d2f0554a88b42064fd0f6d996118c4f2 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 11:46:36 -0400
Subject: [PATCH 079/141] Typo

---
 Sources/SwiftSgml/TypedTag.swift | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index 9dc48e0..1044faa 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -17,7 +17,7 @@ open class TypedTag: Tag {
                    children)
     }
     
-    // alternate designated initializer with builder parameter for subclassing convenience
+    // alternate designated initializer with builder parameter for convenient subclassing
     public init(name: String? = nil,
                 contents: String? = nil,
                 attributes: [Attribute]? = nil,
@@ -38,16 +38,6 @@ open class TypedTag: Tag {
                   [child])
     }
     
-    public convenience init(name: String? = nil,
-                            contents: String? = nil,
-                            attributes: [Attribute]? = nil,
-                            @TagBuilder _ builder: () -> [Tag]) {
-        self.init(name: name,
-                  contents: contents,
-                  attributes: attributes,
-                  builder())
-    }
-    
     public convenience init(_ contents: String) {
         self.init(contents: contents)
     }

From f17bc5916ccf53057dd91a42e28d54ba49131d6f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 13 Jul 2023 12:01:35 -0400
Subject: [PATCH 080/141] Default initializer with builder function causes
 major problems...

---
 Sources/SwiftSgml/Tag.swift      | 21 ++++-----------------
 Sources/SwiftSgml/TypedTag.swift | 21 ++++++++++-----------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 9df43b4..5046882 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -37,19 +37,6 @@ open class Tag {
         self.children = children
     }
     
-    // alternate designated initializer with builder parameter to make subclassing easier
-    public init(type: `Type`? = nil,
-                name: String? = nil,
-                contents: String? = nil,
-                attributes: [Attribute]? = nil,
-                @TagBuilder _ builder: () -> Tag) {
-        self.type = type ?? Self.type
-        self.name = name ?? Self.name
-        self.contents = contents
-        self.attributes = attributes
-        self.children = [builder()]
-    }
-    
     public convenience init(type: `Type`? = nil,
                             name: String? = nil,
                             contents: String? = nil,
@@ -63,10 +50,10 @@ open class Tag {
     }
     
     public convenience init(type: `Type`? = nil,
-                            name: String? = nil,
-                            contents: String? = nil,
-                            attributes: [Attribute]? = nil,
-                            @TagBuilder _ builder: () -> Tag) {
+                name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute]? = nil,
+                @TagBuilder _ builder: () -> Tag) {
         self.init(type: type,
                   name: name,
                   contents: contents,
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TypedTag.swift
index 1044faa..c72362b 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TypedTag.swift
@@ -17,17 +17,6 @@ open class TypedTag: Tag {
                    children)
     }
     
-    // alternate designated initializer with builder parameter for convenient subclassing
-    public init(name: String? = nil,
-                contents: String? = nil,
-                attributes: [Attribute]? = nil,
-                @TagBuilder _ builder: () -> Tag) {
-        super.init(name: name,
-                  contents: contents,
-                  attributes: attributes,
-                  [builder()])
-    }
-    
     public convenience init(name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute]? = nil,
@@ -38,6 +27,16 @@ open class TypedTag: Tag {
                   [child])
     }
     
+    public convenience init(name: String? = nil,
+                contents: String? = nil,
+                attributes: [Attribute]? = nil,
+                @TagBuilder _ builder: () -> Tag) {
+        self.init(name: name,
+                  contents: contents,
+                  attributes: attributes,
+                  [builder()])
+    }
+    
     public convenience init(_ contents: String) {
         self.init(contents: contents)
     }

From 3f2bde09e44a5ef54ae1c67360dbde26da7b2eab Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 10:10:12 -0400
Subject: [PATCH 081/141] Change Tag > `Type` to Kind

---
 Sources/SwiftSgml/CommentTag.swift            |  4 +--
 Sources/SwiftSgml/DocumentRenderer.swift      |  4 +--
 Sources/SwiftSgml/EmptyTag.swift              |  4 +--
 Sources/SwiftSgml/StandardTag.swift           |  4 +--
 Sources/SwiftSgml/Tag.swift                   | 36 +++++++++----------
 .../{TypedTag.swift => TagKind.swift}         |  2 +-
 6 files changed, 27 insertions(+), 27 deletions(-)
 rename Sources/SwiftSgml/{TypedTag.swift => TagKind.swift} (97%)

diff --git a/Sources/SwiftSgml/CommentTag.swift b/Sources/SwiftSgml/CommentTag.swift
index 941073f..aa5c71f 100644
--- a/Sources/SwiftSgml/CommentTag.swift
+++ b/Sources/SwiftSgml/CommentTag.swift
@@ -5,7 +5,7 @@
 //  Created by Brad Gourley on 7/11/23.
 //
 
-open class CommentTag: TypedTag {
+open class CommentTag: TagKind {
         
-    override open class var type: `Type`? { .comment }    
+    override open class var kind: Kind? { .comment }    
 }
diff --git a/Sources/SwiftSgml/DocumentRenderer.swift b/Sources/SwiftSgml/DocumentRenderer.swift
index a8c9522..b3fdeda 100644
--- a/Sources/SwiftSgml/DocumentRenderer.swift
+++ b/Sources/SwiftSgml/DocumentRenderer.swift
@@ -38,8 +38,8 @@ public struct DocumentRenderer {
 
     private func render(tag: Tag, level: Int = 0) -> String {
         let spaces = String(repeating: " ", count: level * indent)
-        if let type = tag.type {
-            switch type {
+        if let kind = tag.kind {
+            switch kind {
             case .comment:
                 return spaces + "<!-- " + (tag.contents ?? "") + " -->"
             case .empty:
diff --git a/Sources/SwiftSgml/EmptyTag.swift b/Sources/SwiftSgml/EmptyTag.swift
index b5904ea..7185aad 100644
--- a/Sources/SwiftSgml/EmptyTag.swift
+++ b/Sources/SwiftSgml/EmptyTag.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2022. 02. 11..
 //
 
-open class EmptyTag: TypedTag {
+open class EmptyTag: TagKind {
     
-    override open class var type: `Type`? { .empty }
+    override open class var kind: Kind? { .empty }
 }
diff --git a/Sources/SwiftSgml/StandardTag.swift b/Sources/SwiftSgml/StandardTag.swift
index a969b93..1d9e420 100644
--- a/Sources/SwiftSgml/StandardTag.swift
+++ b/Sources/SwiftSgml/StandardTag.swift
@@ -5,7 +5,7 @@
 //  Created by Brad Gourley on 7/9/23.
 //
 
-open class StandardTag: TypedTag {
+open class StandardTag: TagKind {
     
-    override open class var type: `Type`? { .standard }
+    override open class var kind: Kind? { .standard }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 5046882..2714c7d 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -9,52 +9,52 @@
 
 open class Tag {
     
-    public enum `Type` {
+    public enum Kind {
         case comment    // <!-- -->
         case empty      // <name>
         case standard   // <name></name>
     }
     
-    public let type: `Type`?    // type == nil only children rendered
+    public let kind: Kind?    // type == nil only children rendered
     public let name: String
     public var contents: String?
     public internal(set) var attributes: [Attribute]?
     public private(set) var children: [Tag]?
     
-    open class var type: `Type`? { nil }
+    open class var kind: Kind? { nil }
     open class var name: String { .init(self).lowercased() }
-        
+    
     // MARK: - init
-    public init(type: `Type`? = nil,
+    public init(kind: Kind? = nil,
                 name: String? = nil,
                 contents: String? = nil,
                 attributes: [Attribute]? = nil,
                 _ children: [Tag]? = nil) {
-        self.type = type ?? Self.type
+        self.kind = kind ?? Self.kind
         self.name = name ?? Self.name
         self.contents = contents
         self.attributes = attributes
         self.children = children
     }
     
-    public convenience init(type: `Type`? = nil,
+    public convenience init(kind: Kind? = nil,
                             name: String? = nil,
                             contents: String? = nil,
                             attributes: [Attribute]? = nil,
                             _ child: Tag) {
-        self.init(type: type,
+        self.init(kind: kind,
                   name: name,
                   contents: contents,
                   attributes: attributes,
                   [child])
     }
     
-    public convenience init(type: `Type`? = nil,
-                name: String? = nil,
-                contents: String? = nil,
-                attributes: [Attribute]? = nil,
-                @TagBuilder _ builder: () -> Tag) {
-        self.init(type: type,
+    public convenience init(kind: Kind? = nil,
+                            name: String? = nil,
+                            contents: String? = nil,
+                            attributes: [Attribute]? = nil,
+                            @TagBuilder _ builder: () -> Tag) {
+        self.init(kind: kind,
                   name: name,
                   contents: contents,
                   attributes: attributes,
@@ -64,7 +64,7 @@ open class Tag {
     public convenience init(_ contents: String) {
         self.init(contents: contents)
     }
-
+    
     // MARK: - contents
     
     /// set contents
@@ -73,7 +73,7 @@ open class Tag {
         contents = condition ? value : contents
         return self
     }
-
+    
     // MARK: - attributes
     
     /// add or replace an attribute with a given key to the node
@@ -82,7 +82,7 @@ open class Tag {
         self.attributes = self.attributes ?? []
         self.attributes?.append(attribute)
     }
-
+    
     /// deletes a attribute with a given key from the node
     private func delete(_ attribute: Attribute) {
         guard let attributes = attributes else { return }
@@ -113,7 +113,7 @@ open class Tag {
         }
         return self
     }
-
+    
     /// add a new flag-like attribute with a given value if the condition is true
     ///
     /// if the flag value is `nil` only the attribute key will be used. eg. `<foo bar></foo>`
diff --git a/Sources/SwiftSgml/TypedTag.swift b/Sources/SwiftSgml/TagKind.swift
similarity index 97%
rename from Sources/SwiftSgml/TypedTag.swift
rename to Sources/SwiftSgml/TagKind.swift
index c72362b..062f395 100644
--- a/Sources/SwiftSgml/TypedTag.swift
+++ b/Sources/SwiftSgml/TagKind.swift
@@ -5,7 +5,7 @@
 //  Created by Brad Gourley on 7/12/23.
 //
 
-open class TypedTag: Tag {
+open class TagKind: Tag {
     
     public init(name: String? = nil,
                 contents: String? = nil,

From 6162668fd8078580a329b16d5b7c0ad4fbc2811e Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 13:57:00 -0400
Subject: [PATCH 082/141] Add property for scripts

---
 Sources/SwiftHtml/Tags/Head.swift | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index f44c8d5..df33d2d 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -23,4 +23,18 @@
 open class Head: StandardTag {
     
     override open class var name: String { .init(Head.self) }
+    
+    public let scripts: [Script]?
+    
+    public init(scripts: [Script]? = nil,
+                @TagBuilder _ builder: () -> Tag) {
+        self.scripts = scripts
+        let temp = Tag {
+            builder()
+            if let scripts = scripts {
+                Tag { scripts }
+            }
+        }
+        super.init(temp.children)
+    }
 }

From 89acfe188d81b7913518f58765ad7d141765101c Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 14:45:57 -0400
Subject: [PATCH 083/141] Add properties

---
 Sources/SwiftHtml/Tags/Head.swift | 50 ++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index df33d2d..d04c89d 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -24,17 +24,51 @@ open class Head: StandardTag {
     
     override open class var name: String { .init(Head.self) }
     
-    public let scripts: [Script]?
+    public var title: Title?
+    public var styles: [Style]
+    public var links: [Link]
+    public var metas: [Meta]
+    public var scripts: [Script]
+    public var bases: [Base]
     
-    public init(scripts: [Script]? = nil,
-                @TagBuilder _ builder: () -> Tag) {
+    public init(title: Title? = nil,
+                styles: [Style] = [],
+                links: [Link] = [],
+                metas: [Meta] = [],
+                scripts: [Script] = [],
+                bases: [Base] = [],
+                _ children: [Tag]? = nil) {
+        self.title = title
+        self.styles = styles
+        self.links = links
+        self.metas = metas
         self.scripts = scripts
+        self.bases = bases
         let temp = Tag {
-            builder()
-            if let scripts = scripts {
-                Tag { scripts }
-            }
+            title != nil ? [title!] : []
+            styles
+            links
+            metas
+            scripts
+            bases
+            children ?? []
         }
-        super.init(temp.children)
+        super.init(name: Self.name, temp.children)
+    }
+    
+    public convenience init(title: Title? = nil,
+                            styles: [Style] = [],
+                            links: [Link] = [],
+                            metas: [Meta] = [],
+                            scripts: [Script] = [],
+                            bases: [Base] = [],
+                            @TagBuilder _ builder: () -> Tag) {
+        self.init(title: title,
+                  styles: styles,
+                  links: links,
+                  metas: metas,
+                  scripts: scripts,
+                  bases: bases,
+                  [builder()])
     }
 }

From 263da182f8be07fe9beb4c9f26f12f56d87e9d22 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 14:53:38 -0400
Subject: [PATCH 084/141] Editing Properties

---
 Sources/SwiftHtml/Tags/Body.swift | 17 +++++++++++++++++
 Sources/SwiftHtml/Tags/Head.swift | 12 ++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 6e352d9..0404d7d 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -13,4 +13,21 @@
 open class Body: StandardTag {
     
     override open class var name: String { .init(Body.self) }
+    
+    public private(set) var scripts: [Script]
+    
+    public init(scripts: [Script] = [],
+                _ children: [Tag]? = nil) {
+        self.scripts = scripts
+        let temp = Tag {
+            if let children = children { children }
+            Tag { scripts }
+        }
+        super.init(temp.children)
+    }
+    
+    public convenience init(scripts: [Script] = [],
+                            @TagBuilder _ builder: () -> Tag) {
+        self.init(scripts: scripts, [builder()])
+    }
 }
diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index d04c89d..516482f 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -24,12 +24,12 @@ open class Head: StandardTag {
     
     override open class var name: String { .init(Head.self) }
     
-    public var title: Title?
-    public var styles: [Style]
-    public var links: [Link]
-    public var metas: [Meta]
-    public var scripts: [Script]
-    public var bases: [Base]
+    public private(set) var title: Title?
+    public private(set) var styles: [Style]
+    public private(set) var links: [Link]
+    public private(set) var metas: [Meta]
+    public private(set) var scripts: [Script]
+    public private(set) var bases: [Base]
     
     public init(title: Title? = nil,
                 styles: [Style] = [],

From 81be93057fb4164b4a594761ec292e788bb60f6c Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 15:14:04 -0400
Subject: [PATCH 085/141] Make properties optional

---
 Sources/SwiftHtml/Tags/Head.swift | 40 +++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index 516482f..ecba7f1 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -25,18 +25,18 @@ open class Head: StandardTag {
     override open class var name: String { .init(Head.self) }
     
     public private(set) var title: Title?
-    public private(set) var styles: [Style]
-    public private(set) var links: [Link]
-    public private(set) var metas: [Meta]
-    public private(set) var scripts: [Script]
-    public private(set) var bases: [Base]
+    public private(set) var styles: [Style]?
+    public private(set) var links: [Link]?
+    public private(set) var metas: [Meta]?
+    public private(set) var scripts: [Script]?
+    public private(set) var bases: [Base]?
     
     public init(title: Title? = nil,
-                styles: [Style] = [],
-                links: [Link] = [],
-                metas: [Meta] = [],
-                scripts: [Script] = [],
-                bases: [Base] = [],
+                styles: [Style]? = nil,
+                links: [Link]? = nil,
+                metas: [Meta]? = nil,
+                scripts: [Script]? = nil,
+                bases: [Base]? = nil,
                 _ children: [Tag]? = nil) {
         self.title = title
         self.styles = styles
@@ -46,22 +46,22 @@ open class Head: StandardTag {
         self.bases = bases
         let temp = Tag {
             title != nil ? [title!] : []
-            styles
-            links
-            metas
-            scripts
-            bases
+            styles ?? []
+            links ?? []
+            metas ?? []
+            scripts ?? []
+            bases ?? []
             children ?? []
         }
         super.init(name: Self.name, temp.children)
     }
     
     public convenience init(title: Title? = nil,
-                            styles: [Style] = [],
-                            links: [Link] = [],
-                            metas: [Meta] = [],
-                            scripts: [Script] = [],
-                            bases: [Base] = [],
+                            styles: [Style]? = nil,
+                            links: [Link]? = nil,
+                            metas: [Meta]? = nil,
+                            scripts: [Script]? = nil,
+                            bases: [Base]? = nil,
                             @TagBuilder _ builder: () -> Tag) {
         self.init(title: title,
                   styles: styles,

From c5b5cc7a3ed1e039d85af0a796e0016146a8abea Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 15:38:59 -0400
Subject: [PATCH 086/141] Make scripts property optional

---
 Sources/SwiftHtml/Tags/Body.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 0404d7d..600584e 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -14,14 +14,14 @@ open class Body: StandardTag {
     
     override open class var name: String { .init(Body.self) }
     
-    public private(set) var scripts: [Script]
+    public private(set) var scripts: [Script]?
     
-    public init(scripts: [Script] = [],
+    public init(scripts: [Script]? = nil,
                 _ children: [Tag]? = nil) {
-        self.scripts = scripts
+        self.scripts = scripts ?? []
         let temp = Tag {
             if let children = children { children }
-            Tag { scripts }
+            if let scripts = scripts { scripts }
         }
         super.init(temp.children)
     }

From 50d1ebe0adfae6dbf217cecefce32dcfc3d96448 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 16:20:53 -0400
Subject: [PATCH 087/141] Add event functions

---
 Sources/SwiftHtml/Attributes/Events.swift | 282 +++++++++++-----------
 Sources/SwiftHtml/Tags/Body.swift         |  49 ++++
 2 files changed, 190 insertions(+), 141 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 73c349e..8c72eb2 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -10,373 +10,373 @@ public extension Tag {
     // MARK: - Window Event Attributes
     
     /// Script to be run after the document is printed
-    func onAfterPrint(_ value: String) -> Self {
-        attribute("onafterprint", value, true)
+    func onAfterPrint(_ value: String?) -> Self {
+        attribute("onafterprint", value)
     }
     
     /// Script to be run before the document is printed
-    func onBeforePrint(_ value: String) -> Self {
-        attribute("onbeforeprint", value, true)
+    func onBeforePrint(_ value: String?) -> Self {
+        attribute("onbeforeprint", value)
     }
     
     /// Script to be run when the document is about to be unloaded
-    func onBeforeUnload(_ value: String) -> Self {
-        attribute("onbeforeunload", value, true)
+    func onBeforeUnload(_ value: String?) -> Self {
+        attribute("onbeforeunload", value)
     }
     
     /// Script to be run when an error occurs
-    func onError(_ value: String) -> Self {
-        attribute("onerror", value, true)
+    func onError(_ value: String?) -> Self {
+        attribute("onerror", value)
     }
     
     /// Script to be run when there has been changes to the anchor part of the a URL
-    func onHashChange(_ value: String) -> Self {
-        attribute("onhashchange", value, true)
+    func onHashChange(_ value: String?) -> Self {
+        attribute("onhashchange", value)
     }
     
     /// Fires after the page is finished loading
-    func onLoad(_ value: String) -> Self {
-        attribute("onload", value, true)
+    func onLoad(_ value: String?) -> Self {
+        attribute("onload", value)
     }
     
     /// Script to be run when the message is triggered
-    func onMessage(_ value: String) -> Self {
-        attribute("onmessage", value, true)
+    func onMessage(_ value: String?) -> Self {
+        attribute("onmessage", value)
     }
     
     /// Script to be run when the browser starts to work offline
-    func onOffline(_ value: String) -> Self {
-        attribute("onoffline", value, true)
+    func onOffline(_ value: String?) -> Self {
+        attribute("onoffline", value)
     }
     
     /// Script to be run when the browser starts to work online
-    func onOnline(_ value: String) -> Self {
-        attribute("ononline", value, true)
+    func onOnline(_ value: String?) -> Self {
+        attribute("ononline", value)
     }
     
     /// Script to be run when a user navigates away from a page
-    func onPageHide(_ value: String) -> Self {
-        attribute("onpagehide", value, true)
+    func onPageHide(_ value: String?) -> Self {
+        attribute("onpagehide", value)
     }
     
     /// Script to be run when a user navigates to a page
-    func onPageShow(_ value: String) -> Self {
-        attribute("onpageshow", value, true)
+    func onPageShow(_ value: String?) -> Self {
+        attribute("onpageshow", value)
     }
     
     /// Script to be run when the window's history changes
-    func onPopState(_ value: String) -> Self {
-        attribute("onpopstate", value, true)
+    func onPopState(_ value: String?) -> Self {
+        attribute("onpopstate", value)
     }
     
     /// Fires when the browser window is resized
-    func onResize(_ value: String) -> Self {
-        attribute("onresize", value, true)
+    func onResize(_ value: String?) -> Self {
+        attribute("onresize", value)
     }
     
     /// Script to be run when a Web Storage area is updated
-    func onStorage(_ value: String) -> Self {
-        attribute("onstorage", value, true)
+    func onStorage(_ value: String?) -> Self {
+        attribute("onstorage", value)
     }
     
     /// Fires once a page has unloaded (or the browser window has been closed)
-    func onUnload(_ value: String) -> Self {
-        attribute("onunload", value, true)
+    func onUnload(_ value: String?) -> Self {
+        attribute("onunload", value)
     }
     
     // MARK: - Form Events
     
     /// Fires the moment that the element loses focus
-    func onBlur(_ value: String) -> Self {
-        attribute("onblur", value, true)
+    func onBlur(_ value: String?) -> Self {
+        attribute("onblur", value)
     }
 
     /// Fires the moment when the value of the element is changed
-    func onChange(_ value: String) -> Self {
-        attribute("onchange", value, true)
+    func onChange(_ value: String?) -> Self {
+        attribute("onchange", value)
     }
 
     /// Script to be run when a context menu is triggered
-    func onContextMenu(_ value: String) -> Self {
-        attribute("oncontextmenu", value, true)
+    func onContextMenu(_ value: String?) -> Self {
+        attribute("oncontextmenu", value)
     }
 
     /// Fires the moment when the element gets focus
-    func onFocus(_ value: String) -> Self {
-        attribute("onfocus", value, true)
+    func onFocus(_ value: String?) -> Self {
+        attribute("onfocus", value)
     }
 
     /// Script to be run when an element gets user input
-    func onInput(_ value: String) -> Self {
-        attribute("oninput", value, true)
+    func onInput(_ value: String?) -> Self {
+        attribute("oninput", value)
     }
 
     /// Script to be run when an element is invalid
-    func onInvalid(_ value: String) -> Self {
-        attribute("oninvalid", value, true)
+    func onInvalid(_ value: String?) -> Self {
+        attribute("oninvalid", value)
     }
 
     /// Fires when the Reset button in a form is clicked
-    func onReset(_ value: String) -> Self {
-        attribute("onreset", value, true)
+    func onReset(_ value: String?) -> Self {
+        attribute("onreset", value)
     }
 
     /// Fires when the user writes something in a search field (for <input="search">)
-    func onSearch(_ value: String) -> Self {
-        attribute("onsearch", value, true)
+    func onSearch(_ value: String?) -> Self {
+        attribute("onsearch", value)
     }
 
     /// Fires after some text has been selected in an element
-    func onSelect(_ value: String) -> Self {
-        attribute("onselect", value, true)
+    func onSelect(_ value: String?) -> Self {
+        attribute("onselect", value)
     }
 
     /// Fires when a form is submitted
-    func onSubmit(_ value: String) -> Self {
-        attribute("onsubmit", value, true)
+    func onSubmit(_ value: String?) -> Self {
+        attribute("onsubmit", value)
     }
     
     // MARK: - Keyboard Events
     
 
     /// Fires when a user is pressing a key
-    func onKeyDown(_ value: String) -> Self {
-        attribute("onkeydown", value, true)
+    func onKeyDown(_ value: String?) -> Self {
+        attribute("onkeydown", value)
     }
 
     /// Fires when a user presses a key
-    func onKeyPress(_ value: String) -> Self {
-        attribute("onkeypress", value, true)
+    func onKeyPress(_ value: String?) -> Self {
+        attribute("onkeypress", value)
     }
 
     /// Fires when a user releases a key
-    func onKeyUp(_ value: String) -> Self {
-        attribute("onkeyup", value, true)
+    func onKeyUp(_ value: String?) -> Self {
+        attribute("onkeyup", value)
     }
     
     // MARK: - Mouse Events
     
 
     /// Fires on a mouse click on the element
-    func onClick(_ value: String) -> Self {
-        attribute("onclick", value, true)
+    func onClick(_ value: String?) -> Self {
+        attribute("onclick", value)
     }
 
     /// Fires on a mouse double-click on the element
-    func onDoubleClick(_ value: String) -> Self {
-        attribute("ondblclick", value, true)
+    func onDoubleClick(_ value: String?) -> Self {
+        attribute("ondblclick", value)
     }
 
     /// Fires when a mouse button is pressed down on an element
-    func onMouseDown(_ value: String) -> Self {
-        attribute("onmousedown", value, true)
+    func onMouseDown(_ value: String?) -> Self {
+        attribute("onmousedown", value)
     }
 
     /// Fires when the mouse pointer is moving while it is over an element
-    func onMouseMove(_ value: String) -> Self {
-        attribute("onmousemove", value, true)
+    func onMouseMove(_ value: String?) -> Self {
+        attribute("onmousemove", value)
     }
 
     /// Fires when the mouse pointer moves out of an element
-    func onMouseOut(_ value: String) -> Self {
-        attribute("onmouseout", value, true)
+    func onMouseOut(_ value: String?) -> Self {
+        attribute("onmouseout", value)
     }
 
     /// Fires when the mouse pointer moves over an element
-    func onMouseOver(_ value: String) -> Self {
-        attribute("onmouseover", value, true)
+    func onMouseOver(_ value: String?) -> Self {
+        attribute("onmouseover", value)
     }
 
     /// Fires when a mouse button is released over an element
-    func onMouseUp(_ value: String) -> Self {
-        attribute("onmouseup", value, true)
+    func onMouseUp(_ value: String?) -> Self {
+        attribute("onmouseup", value)
     }
 
     /// Fires when the mouse wheel rolls up or down over an element
-    func onWheel(_ value: String) -> Self {
-        attribute("onwheel", value, true)
+    func onWheel(_ value: String?) -> Self {
+        attribute("onwheel", value)
     }
     
     // MARK: - Drag Events
 
     /// Script to be run when an element is dragged
-    func onDrag(_ value: String) -> Self {
-        attribute("ondrag", value, true)
+    func onDrag(_ value: String?) -> Self {
+        attribute("ondrag", value)
     }
 
     /// Script to be run at the end of a drag operation
-    func onDragEnd(_ value: String) -> Self {
-        attribute("ondragend", value, true)
+    func onDragEnd(_ value: String?) -> Self {
+        attribute("ondragend", value)
     }
 
     /// Script to be run when an element has been dragged to a valid drop target
-    func onDragEnter(_ value: String) -> Self {
-        attribute("ondragenter", value, true)
+    func onDragEnter(_ value: String?) -> Self {
+        attribute("ondragenter", value)
     }
 
     /// Script to be run when an element leaves a valid drop target
-    func onDragLeave(_ value: String) -> Self {
-        attribute("ondragleave", value, true)
+    func onDragLeave(_ value: String?) -> Self {
+        attribute("ondragleave", value)
     }
 
     /// Script to be run when an element is being dragged over a valid drop target
-    func onDragOver(_ value: String) -> Self {
-        attribute("ondragover", value, true)
+    func onDragOver(_ value: String?) -> Self {
+        attribute("ondragover", value)
     }
 
     /// Script to be run at the start of a drag operation
-    func onDragStart(_ value: String) -> Self {
-        attribute("ondragstart", value, true)
+    func onDragStart(_ value: String?) -> Self {
+        attribute("ondragstart", value)
     }
 
     /// Script to be run when dragged element is being dropped
-    func onDrop(_ value: String) -> Self {
-        attribute("ondrop", value, true)
+    func onDrop(_ value: String?) -> Self {
+        attribute("ondrop", value)
     }
 
     /// Script to be run when an element's scrollbar is being scrolled
-    func onScroll(_ value: String) -> Self {
-        attribute("onscroll", value, true)
+    func onScroll(_ value: String?) -> Self {
+        attribute("onscroll", value)
     }
     
     // MARK: - Clipboard Events
 
     /// Fires when the user copies the content of an element
-    func onCopy(_ value: String) -> Self {
-        attribute("oncopy", value, true)
+    func onCopy(_ value: String?) -> Self {
+        attribute("oncopy", value)
     }
 
     /// Fires when the user cuts the content of an element
-    func onCut(_ value: String) -> Self {
-        attribute("oncut", value, true)
+    func onCut(_ value: String?) -> Self {
+        attribute("oncut", value)
     }
 
     /// Fires when the user pastes some content in an element
-    func onPaste(_ value: String) -> Self {
-        attribute("onpaste", value, true)
+    func onPaste(_ value: String?) -> Self {
+        attribute("onpaste", value)
     }
     
     // MARK: - Media Events
     
     /// Script to be run on abort
-    func onAbort(_ value: String) -> Self {
-        attribute("onabort", value, true)
+    func onAbort(_ value: String?) -> Self {
+        attribute("onabort", value)
     }
 
     /// Script to be run when a file is ready to start playing (when it has buffered enough to begin)
-    func onCanPlay(_ value: String) -> Self {
-        attribute("oncanplay", value, true)
+    func onCanPlay(_ value: String?) -> Self {
+        attribute("oncanplay", value)
     }
 
     /// Script to be run when a file can be played all the way to the end without pausing for buffering
-    func onCanPlaythrough(_ value: String) -> Self {
-        attribute("oncanplaythrough", value, true)
+    func onCanPlaythrough(_ value: String?) -> Self {
+        attribute("oncanplaythrough", value)
     }
 
     /// Script to be run when the cue changes in a <track> element
-    func onCueChange(_ value: String) -> Self {
-        attribute("oncuechange", value, true)
+    func onCueChange(_ value: String?) -> Self {
+        attribute("oncuechange", value)
     }
 
     /// Script to be run when the length of the media changes
-    func onDurationChange(_ value: String) -> Self {
-        attribute("ondurationchange", value, true)
+    func onDurationChange(_ value: String?) -> Self {
+        attribute("ondurationchange", value)
     }
 
     /// Script to be run when something bad happens and the file is suddenly unavailable (like unexpectedly disconnects)
-    func onEmptied(_ value: String) -> Self {
-        attribute("onemptied", value, true)
+    func onEmptied(_ value: String?) -> Self {
+        attribute("onemptied", value)
     }
 
     /// Script to be run when the media has reach the end (a useful event for messages like "thanks for listening")
-    func onEnded(_ value: String) -> Self {
-        attribute("onended", value, true)
+    func onEnded(_ value: String?) -> Self {
+        attribute("onended", value)
     }
 
     /// Script to be run when an error occurs when the file is being loaded
-//    func onError(_ value: String) -> Self {
+//    func onError(_ value: String?) -> Self {
 //        attribute("onerror", value)
 //    }
 
     /// Script to be run when media data is loaded
-    func onLoadedData(_ value: String) -> Self {
-        attribute("onloadeddata", value, true)
+    func onLoadedData(_ value: String?) -> Self {
+        attribute("onloadeddata", value)
     }
 
     /// Script to be run when meta data (like dimensions and duration) are loaded
-    func onLoadedMetadata(_ value: String) -> Self {
-        attribute("onloadedmetadata", value, true)
+    func onLoadedMetadata(_ value: String?) -> Self {
+        attribute("onloadedmetadata", value)
     }
 
     /// Script to be run just as the file begins to load before anything is actually loaded
-    func onLoadStart(_ value: String) -> Self {
-        attribute("onloadstart", value, true)
+    func onLoadStart(_ value: String?) -> Self {
+        attribute("onloadstart", value)
     }
 
     /// Script to be run when the media is paused either by the user or programmatically
-    func onPause(_ value: String) -> Self {
-        attribute("onpause", value, true)
+    func onPause(_ value: String?) -> Self {
+        attribute("onpause", value)
     }
 
     /// Script to be run when the media is ready to start playing
-    func onPlay(_ value: String) -> Self {
-        attribute("onplay", value, true)
+    func onPlay(_ value: String?) -> Self {
+        attribute("onplay", value)
     }
 
     /// Script to be run when the media actually has started playing
-    func onPlaying(_ value: String) -> Self {
-        attribute("onplaying", value, true)
+    func onPlaying(_ value: String?) -> Self {
+        attribute("onplaying", value)
     }
 
     /// Script to be run when the browser is in the process of getting the media data
-    func onProgress(_ value: String) -> Self {
-        attribute("onprogress", value, true)
+    func onProgress(_ value: String?) -> Self {
+        attribute("onprogress", value)
     }
 
     /// Script to be run each time the playback rate changes (like when a user switches to a slow motion or fast forward mode)
-    func onRateChange(_ value: String) -> Self {
-        attribute("onratechange", value, true)
+    func onRateChange(_ value: String?) -> Self {
+        attribute("onratechange", value)
     }
 
     /// Script to be run when the seeking attribute is set to false indicating that seeking has ended
-    func onSeeked(_ value: String) -> Self {
-        attribute("onseeked", value, true)
+    func onSeeked(_ value: String?) -> Self {
+        attribute("onseeked", value)
     }
 
     /// Script to be run when the seeking attribute is set to true indicating that seeking is active
-    func onSeeking(_ value: String) -> Self {
-        attribute("onseeking", value, true)
+    func onSeeking(_ value: String?) -> Self {
+        attribute("onseeking", value)
     }
 
     /// Script to be run when the browser is unable to fetch the media data for whatever reason
-    func onStalled(_ value: String) -> Self {
-        attribute("onstalled", value, true)
+    func onStalled(_ value: String?) -> Self {
+        attribute("onstalled", value)
     }
 
     /// Script to be run when fetching the media data is stopped before it is completely loaded for whatever reason
-    func onSuspend(_ value: String) -> Self {
-        attribute("onsuspend", value, true)
+    func onSuspend(_ value: String?) -> Self {
+        attribute("onsuspend", value)
     }
 
     /// Script to be run when the playing position has changed (like when the user fast forwards to a different point in the media)
-    func onTimeUpdate(_ value: String) -> Self {
-        attribute("ontimeupdate", value, true)
+    func onTimeUpdate(_ value: String?) -> Self {
+        attribute("ontimeupdate", value)
     }
 
     /// Script to be run each time the volume is changed which (includes setting the volume to "mute")
-    func onVolumeChange(_ value: String) -> Self {
-        attribute("onvolumechange", value, true)
+    func onVolumeChange(_ value: String?) -> Self {
+        attribute("onvolumechange", value)
     }
 
     /// Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
-    func onWaiting(_ value: String) -> Self {
-        attribute("onwaiting", value, true)
+    func onWaiting(_ value: String?) -> Self {
+        attribute("onwaiting", value)
     }
     
     // MARK: - Misc Events
     
     /// Fires when the user opens or closes the <details> element
-    func onToggle(_ value: String) -> Self {
-        attribute("ontoggle", value, true)
+    func onToggle(_ value: String?) -> Self {
+        attribute("ontoggle", value)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 600584e..9918acd 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,15 +15,34 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
+    public private(set) var eventFuncs: [BodyEvent : [JsFunction]]?
     
     public init(scripts: [Script]? = nil,
+                eventFuncs efs: [BodyEvent : [JsFunction]]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
+        self.eventFuncs = efs
         let temp = Tag {
             if let children = children { children }
             if let scripts = scripts { scripts }
         }
         super.init(temp.children)
+        _ = self
+            .onAfterPrint(efs?[.onAfterPrint])
+            .onBeforePrint(efs?[.onBeforePrint])
+            .onBeforeUnload(efs?[.onBeforeUnload])
+            .onError(efs?[.onError])
+            .onHashChange(efs?[.onHashChange])
+            .onLoad(efs?[.onLoad])
+            .onMessage(efs?[.onMessage])
+            .onOffline(efs?[.onOffline])
+            .onOnline(efs?[.onOnline])
+            .onPageHide(efs?[.onPageHide])
+            .onPageShow(efs?[.onPageShow])
+            .onPopState(efs?[.onPopState])
+            .onResize(efs?[.onResize])
+            .onStorage(efs?[.onStorage])
+            .onUnload(efs?[.onUnload])
     }
     
     public convenience init(scripts: [Script] = [],
@@ -31,3 +50,33 @@ open class Body: StandardTag {
         self.init(scripts: scripts, [builder()])
     }
 }
+
+extension Body {
+    
+    public enum BodyEvent: String {
+        case onAfterPrint   // run after the document is printed
+        case onBeforePrint  // run before the document is printed
+        case onBeforeUnload // run when the document is about to be unloaded
+        case onError        // run when an error occurs
+        case onHashChange   // run when there has been changes to the anchor part of the a URL
+        case onLoad         // fires after the page is finished loading
+        case onMessage      // run when the message is triggered
+        case onOffline      // run when the browser starts to work offline
+        case onOnline       // run when the browser starts to work online
+        case onPageHide     // run when a user navigates away from a page
+        case onPageShow     // run when a user navigates to a page
+        case onPopState     // run when the window's history changes
+        case onResize       // fires when the browser window is resized
+        case onStorage      // run when a Web Storage area is updated
+        case onUnload       // fires once a page has unloaded (or the browser window has been closed)
+    }
+    
+    public typealias JsFunction = String
+}
+
+extension Dictionary where Key == Body.BodyEvent, Value == [Body.JsFunction] {
+    
+    subscript(key: Key) -> String? {
+        self[key]?.joined(separator: ";\r")
+    }
+}

From e245f3fa4a22374596bdf36cfeb3c7826f12d90e Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:13:32 -0400
Subject: [PATCH 088/141] Events now enum Body handles events

---
 Sources/SwiftHtml/Attributes/Events.swift | 477 +++++-----------------
 Sources/SwiftHtml/Tags/Body.swift         |  67 +--
 2 files changed, 130 insertions(+), 414 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 8c72eb2..0464aab 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -7,376 +7,121 @@
 
 public extension Tag {
     
-    // MARK: - Window Event Attributes
-    
-    /// Script to be run after the document is printed
-    func onAfterPrint(_ value: String?) -> Self {
-        attribute("onafterprint", value)
-    }
-    
-    /// Script to be run before the document is printed
-    func onBeforePrint(_ value: String?) -> Self {
-        attribute("onbeforeprint", value)
-    }
-    
-    /// Script to be run when the document is about to be unloaded
-    func onBeforeUnload(_ value: String?) -> Self {
-        attribute("onbeforeunload", value)
-    }
-    
-    /// Script to be run when an error occurs
-    func onError(_ value: String?) -> Self {
-        attribute("onerror", value)
-    }
-    
-    /// Script to be run when there has been changes to the anchor part of the a URL
-    func onHashChange(_ value: String?) -> Self {
-        attribute("onhashchange", value)
-    }
-    
-    /// Fires after the page is finished loading
-    func onLoad(_ value: String?) -> Self {
-        attribute("onload", value)
-    }
-    
-    /// Script to be run when the message is triggered
-    func onMessage(_ value: String?) -> Self {
-        attribute("onmessage", value)
-    }
-    
-    /// Script to be run when the browser starts to work offline
-    func onOffline(_ value: String?) -> Self {
-        attribute("onoffline", value)
-    }
-    
-    /// Script to be run when the browser starts to work online
-    func onOnline(_ value: String?) -> Self {
-        attribute("ononline", value)
-    }
-    
-    /// Script to be run when a user navigates away from a page
-    func onPageHide(_ value: String?) -> Self {
-        attribute("onpagehide", value)
-    }
-    
-    /// Script to be run when a user navigates to a page
-    func onPageShow(_ value: String?) -> Self {
-        attribute("onpageshow", value)
-    }
-    
-    /// Script to be run when the window's history changes
-    func onPopState(_ value: String?) -> Self {
-        attribute("onpopstate", value)
-    }
-    
-    /// Fires when the browser window is resized
-    func onResize(_ value: String?) -> Self {
-        attribute("onresize", value)
-    }
-    
-    /// Script to be run when a Web Storage area is updated
-    func onStorage(_ value: String?) -> Self {
-        attribute("onstorage", value)
-    }
-    
-    /// Fires once a page has unloaded (or the browser window has been closed)
-    func onUnload(_ value: String?) -> Self {
-        attribute("onunload", value)
-    }
-    
-    // MARK: - Form Events
-    
-    /// Fires the moment that the element loses focus
-    func onBlur(_ value: String?) -> Self {
-        attribute("onblur", value)
-    }
-
-    /// Fires the moment when the value of the element is changed
-    func onChange(_ value: String?) -> Self {
-        attribute("onchange", value)
-    }
-
-    /// Script to be run when a context menu is triggered
-    func onContextMenu(_ value: String?) -> Self {
-        attribute("oncontextmenu", value)
-    }
-
-    /// Fires the moment when the element gets focus
-    func onFocus(_ value: String?) -> Self {
-        attribute("onfocus", value)
-    }
-
-    /// Script to be run when an element gets user input
-    func onInput(_ value: String?) -> Self {
-        attribute("oninput", value)
-    }
-
-    /// Script to be run when an element is invalid
-    func onInvalid(_ value: String?) -> Self {
-        attribute("oninvalid", value)
-    }
-
-    /// Fires when the Reset button in a form is clicked
-    func onReset(_ value: String?) -> Self {
-        attribute("onreset", value)
-    }
-
-    /// Fires when the user writes something in a search field (for <input="search">)
-    func onSearch(_ value: String?) -> Self {
-        attribute("onsearch", value)
-    }
-
-    /// Fires after some text has been selected in an element
-    func onSelect(_ value: String?) -> Self {
-        attribute("onselect", value)
-    }
-
-    /// Fires when a form is submitted
-    func onSubmit(_ value: String?) -> Self {
-        attribute("onsubmit", value)
-    }
-    
-    // MARK: - Keyboard Events
-    
-
-    /// Fires when a user is pressing a key
-    func onKeyDown(_ value: String?) -> Self {
-        attribute("onkeydown", value)
-    }
-
-    /// Fires when a user presses a key
-    func onKeyPress(_ value: String?) -> Self {
-        attribute("onkeypress", value)
-    }
-
-    /// Fires when a user releases a key
-    func onKeyUp(_ value: String?) -> Self {
-        attribute("onkeyup", value)
-    }
-    
-    // MARK: - Mouse Events
-    
-
-    /// Fires on a mouse click on the element
-    func onClick(_ value: String?) -> Self {
-        attribute("onclick", value)
-    }
-
-    /// Fires on a mouse double-click on the element
-    func onDoubleClick(_ value: String?) -> Self {
-        attribute("ondblclick", value)
-    }
-
-    /// Fires when a mouse button is pressed down on an element
-    func onMouseDown(_ value: String?) -> Self {
-        attribute("onmousedown", value)
-    }
-
-    /// Fires when the mouse pointer is moving while it is over an element
-    func onMouseMove(_ value: String?) -> Self {
-        attribute("onmousemove", value)
-    }
-
-    /// Fires when the mouse pointer moves out of an element
-    func onMouseOut(_ value: String?) -> Self {
-        attribute("onmouseout", value)
-    }
-
-    /// Fires when the mouse pointer moves over an element
-    func onMouseOver(_ value: String?) -> Self {
-        attribute("onmouseover", value)
-    }
-
-    /// Fires when a mouse button is released over an element
-    func onMouseUp(_ value: String?) -> Self {
-        attribute("onmouseup", value)
-    }
-
-    /// Fires when the mouse wheel rolls up or down over an element
-    func onWheel(_ value: String?) -> Self {
-        attribute("onwheel", value)
-    }
-    
-    // MARK: - Drag Events
-
-    /// Script to be run when an element is dragged
-    func onDrag(_ value: String?) -> Self {
-        attribute("ondrag", value)
-    }
-
-    /// Script to be run at the end of a drag operation
-    func onDragEnd(_ value: String?) -> Self {
-        attribute("ondragend", value)
-    }
-
-    /// Script to be run when an element has been dragged to a valid drop target
-    func onDragEnter(_ value: String?) -> Self {
-        attribute("ondragenter", value)
-    }
-
-    /// Script to be run when an element leaves a valid drop target
-    func onDragLeave(_ value: String?) -> Self {
-        attribute("ondragleave", value)
-    }
-
-    /// Script to be run when an element is being dragged over a valid drop target
-    func onDragOver(_ value: String?) -> Self {
-        attribute("ondragover", value)
-    }
-
-    /// Script to be run at the start of a drag operation
-    func onDragStart(_ value: String?) -> Self {
-        attribute("ondragstart", value)
-    }
-
-    /// Script to be run when dragged element is being dropped
-    func onDrop(_ value: String?) -> Self {
-        attribute("ondrop", value)
-    }
-
-    /// Script to be run when an element's scrollbar is being scrolled
-    func onScroll(_ value: String?) -> Self {
-        attribute("onscroll", value)
-    }
-    
-    // MARK: - Clipboard Events
-
-    /// Fires when the user copies the content of an element
-    func onCopy(_ value: String?) -> Self {
-        attribute("oncopy", value)
-    }
-
-    /// Fires when the user cuts the content of an element
-    func onCut(_ value: String?) -> Self {
-        attribute("oncut", value)
-    }
-
-    /// Fires when the user pastes some content in an element
-    func onPaste(_ value: String?) -> Self {
-        attribute("onpaste", value)
-    }
-    
-    // MARK: - Media Events
-    
-    /// Script to be run on abort
-    func onAbort(_ value: String?) -> Self {
-        attribute("onabort", value)
-    }
-
-    /// Script to be run when a file is ready to start playing (when it has buffered enough to begin)
-    func onCanPlay(_ value: String?) -> Self {
-        attribute("oncanplay", value)
-    }
-
-    /// Script to be run when a file can be played all the way to the end without pausing for buffering
-    func onCanPlaythrough(_ value: String?) -> Self {
-        attribute("oncanplaythrough", value)
-    }
-
-    /// Script to be run when the cue changes in a <track> element
-    func onCueChange(_ value: String?) -> Self {
-        attribute("oncuechange", value)
-    }
-
-    /// Script to be run when the length of the media changes
-    func onDurationChange(_ value: String?) -> Self {
-        attribute("ondurationchange", value)
-    }
-
-    /// Script to be run when something bad happens and the file is suddenly unavailable (like unexpectedly disconnects)
-    func onEmptied(_ value: String?) -> Self {
-        attribute("onemptied", value)
-    }
-
-    /// Script to be run when the media has reach the end (a useful event for messages like "thanks for listening")
-    func onEnded(_ value: String?) -> Self {
-        attribute("onended", value)
-    }
-
-    /// Script to be run when an error occurs when the file is being loaded
-//    func onError(_ value: String?) -> Self {
-//        attribute("onerror", value)
-//    }
-
-    /// Script to be run when media data is loaded
-    func onLoadedData(_ value: String?) -> Self {
-        attribute("onloadeddata", value)
-    }
-
-    /// Script to be run when meta data (like dimensions and duration) are loaded
-    func onLoadedMetadata(_ value: String?) -> Self {
-        attribute("onloadedmetadata", value)
-    }
-
-    /// Script to be run just as the file begins to load before anything is actually loaded
-    func onLoadStart(_ value: String?) -> Self {
-        attribute("onloadstart", value)
-    }
-
-    /// Script to be run when the media is paused either by the user or programmatically
-    func onPause(_ value: String?) -> Self {
-        attribute("onpause", value)
-    }
-
-    /// Script to be run when the media is ready to start playing
-    func onPlay(_ value: String?) -> Self {
-        attribute("onplay", value)
-    }
-
-    /// Script to be run when the media actually has started playing
-    func onPlaying(_ value: String?) -> Self {
-        attribute("onplaying", value)
-    }
-
-    /// Script to be run when the browser is in the process of getting the media data
-    func onProgress(_ value: String?) -> Self {
-        attribute("onprogress", value)
-    }
-
-    /// Script to be run each time the playback rate changes (like when a user switches to a slow motion or fast forward mode)
-    func onRateChange(_ value: String?) -> Self {
-        attribute("onratechange", value)
-    }
-
-    /// Script to be run when the seeking attribute is set to false indicating that seeking has ended
-    func onSeeked(_ value: String?) -> Self {
-        attribute("onseeked", value)
-    }
-
-    /// Script to be run when the seeking attribute is set to true indicating that seeking is active
-    func onSeeking(_ value: String?) -> Self {
-        attribute("onseeking", value)
-    }
-
-    /// Script to be run when the browser is unable to fetch the media data for whatever reason
-    func onStalled(_ value: String?) -> Self {
-        attribute("onstalled", value)
-    }
-
-    /// Script to be run when fetching the media data is stopped before it is completely loaded for whatever reason
-    func onSuspend(_ value: String?) -> Self {
-        attribute("onsuspend", value)
-    }
-
-    /// Script to be run when the playing position has changed (like when the user fast forwards to a different point in the media)
-    func onTimeUpdate(_ value: String?) -> Self {
-        attribute("ontimeupdate", value)
+    typealias JSFunction = String
+    
+    enum Event: String {
+        // Windows
+        case onAfterPrint       // Script to be run after the document is printed
+        case onBeforePrint      // Script to be run before the document is printed
+        case onBeforeUnload     // Script to be run when the document is about to be unloaded
+        case onError            // Script to be run when an error occurs
+        case onHashChange       // Script to be run when there has been changes to the anchor part of the a URL
+        case onLoad             // Fires after the page is finished loading
+        case onMessage          // Script to be run when the message is triggered
+        case onOffline          // Script to be run when the browser starts to work offline
+        case onOnline           // Script to be run when the browser starts to work online
+        case onPageHide         // Script to be run when a user navigates away from a page
+        case onPageShow         // Script to be run when a user navigates to a page
+        case onPopState         // Script to be run when the window's history changes
+        case onResize           // Fires when the browser window is resized
+        case onStorage          // Script to be run when a Web Storage area is updated
+        case onUnload           // Fires once a page has unloaded (or the browser window has been closed)
+        // Forms
+        case onBlur             // Fires the moment that the element loses focus
+        case onChange           // Fires the moment when the value of the element is changed
+        case onContextMenu      // Script to be run when a context menu is triggered
+        case onFocus            // Fires the moment when the element gets focus
+        case onInput            // Script to be run when an element gets user input
+        case onInvalid          // Script to be run when an element is invalid
+        case onReset            // Fires when the Reset button in a form is clicked
+        case onSearch           // Fires when the user writes something in a search field (for <input="search">)
+        case onSelect           // Fires after some text has been selected in an element
+        case onSubmit           // Fires when a form is submitted
+        // Keyboard
+        case onKeyDown          // Fires when a user is pressing a key
+        case onKeyPress         // Fires when a user presses a key
+        case onKeyUp            // Fires when a user releases a key
+        // Mouse
+        case onClick            // Fires on a mouse click on the element
+        case onDoubleClick      // Fires on a mouse double-click on the element
+        case onMouseDown        // Fires when a mouse button is pressed down on an element
+        case onMouseMove        // Fires when the mouse pointer is moving while it is over an element
+        case onMouseOut         // Fires when the mouse pointer moves out of an element
+        case onMouseOver        // Fires when the mouse pointer moves over an element
+        case onMouseUp          // Fires when a mouse button is released over an element
+        case onWheel            // Fires when the mouse wheel rolls up or down over an element
+        // Drag and Drop
+        case onDrag             // Script to be run when an element is dragged
+        case onDragEnd          // Script to be run at the end of a drag operation
+        case onDragEnter        // Script to be run when an element has been dragged to a valid drop target
+        case onDragLeave        // Script to be run when an element leaves a valid drop target
+        case onDragOver         // Script to be run when an element is being dragged over a valid drop target
+        case onDragStart        // Script to be run at the start of a drag operation
+        case onDrop             // Script to be run when dragged element is being dropped
+        case onScroll           // Script to be run when an element's scrollbar is being scrolled
+        // Clipboard
+        case onCopy             // Fires when the user copies the content of an element
+        case onCut              // Fires when the user cuts the content of an element
+        case onPaste            // Fires when the user pastes some content in an element
+        // Media
+        case onAbort            // Script to be run on abort
+        case onCanPlay          // Script to be run when a file is ready to start playing (when it has buffered enough to begin)
+        case onCanPlaythrough   // Script to be run when a file can be played all the way to the end without pausing for buffering
+        case onCueChange        // Script to be run when the cue changes in a <track> element
+        case onDurationChange   // Script to be run when the length of the media changes
+        case onEmptied          // Script to be run when something bad happens and the file is suddenly unavailable (like unexpectedly disconnects)
+        case onEnded            // Script to be run when the media has reach the end (a useful event for messages like "thanks for listening")
+        case onLoadedData       // Script to be run when media data is loaded
+        case onLoadedMetadata   // Script to be run when meta data (like dimensions and duration) are loaded
+        case onLoadStart        // Script to be run just as the file begins to load before anything is actually loaded
+        case onPause            // Script to be run when the media is paused either by the user or programmatically
+        case onPlay             // Script to be run when the media is ready to start playing
+        case onPlaying          // Script to be run when the media actually has started playing
+        case onProgress         // Script to be run when the browser is in the process of getting the media data
+        case onRateChange       // Script to be run each time the playback rate changes (like when a user switches to a slow motion or fast forward mode)
+        case onSeeked           // Script to be run when the seeking attribute is set to false indicating that seeking has ended
+        case onSeeking          // Script to be run when the seeking attribute is set to true indicating that seeking is active
+        case onStalled          // Script to be run when the browser is unable to fetch the media data for whatever reason
+        case onSuspend          // Script to be run when fetching the media data is stopped before it is completely loaded for whatever reason
+        case onTimeUpdate       // Script to be run when the playing position has changed (like when the user fast forwards to a different point in the media)
+        case onVolumeChange     // Script to be run each time the volume is changed which (includes setting the volume to "mute")
+        case onWaiting          // Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
+        // Misc
+        case onToggle           // Fires when the user opens or closes the <details> element
+    }
+    
+    struct EventFunction {
+        let event: Event
+        let function: JSFunction
+    }
+    
+    func onEvent(_ e: Event, function: JSFunction?, _ condition: Bool = true) -> Self {
+        attribute(e.rawValue.lowercased(), function, condition)
+    }
+    
+    func onEvent(_ ef: EventFunction?, _ condition: Bool = true) -> Self {
+        guard let event = ef?.event else { return self }
+        return onEvent(event, function: ef?.function, condition)
     }
+}
 
-    /// Script to be run each time the volume is changed which (includes setting the volume to "mute")
-    func onVolumeChange(_ value: String?) -> Self {
-        attribute("onvolumechange", value)
-    }
+extension Dictionary where Key == Tag.Event, Value == Tag.JSFunction {
 
-    /// Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
-    func onWaiting(_ value: String?) -> Self {
-        attribute("onwaiting", value)
+    // convert [EventFunction] to [Event:JSFunction] where JSFunctions combined with ";\r"
+    init(_ efs: [Tag.EventFunction]) {
+        self = [:]
+        _ = efs.map{
+            if let existing = self[$0.event] {
+                self[$0.event] = existing + ";\r" + $0.function
+            } else {
+                self[$0.event] = $0.function
+            }
+        }
     }
     
-    // MARK: - Misc Events
-    
-    /// Fires when the user opens or closes the <details> element
-    func onToggle(_ value: String?) -> Self {
-        attribute("ontoggle", value)
+    // retrieve from dictionary as Tag.EventFunction
+    subscript(key: Key) -> Tag.EventFunction? {
+        guard let value = self[key] else { return nil }
+        return Tag.EventFunction(event: key, function: value)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 9918acd..cae5b0a 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,34 +15,35 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
-    public private(set) var eventFuncs: [BodyEvent : [JsFunction]]?
+    public private(set) var eventFuncs: [Event:JSFunction]?
     
     public init(scripts: [Script]? = nil,
-                eventFuncs efs: [BodyEvent : [JsFunction]]? = nil,
+                eventFuncs efs: [EventFunction]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
-        self.eventFuncs = efs
+        // convert [EventFunction] to [Event:JSFunction]
+        self.eventFuncs = efs != nil ? .init(efs!) : nil
         let temp = Tag {
             if let children = children { children }
             if let scripts = scripts { scripts }
         }
         super.init(temp.children)
         _ = self
-            .onAfterPrint(efs?[.onAfterPrint])
-            .onBeforePrint(efs?[.onBeforePrint])
-            .onBeforeUnload(efs?[.onBeforeUnload])
-            .onError(efs?[.onError])
-            .onHashChange(efs?[.onHashChange])
-            .onLoad(efs?[.onLoad])
-            .onMessage(efs?[.onMessage])
-            .onOffline(efs?[.onOffline])
-            .onOnline(efs?[.onOnline])
-            .onPageHide(efs?[.onPageHide])
-            .onPageShow(efs?[.onPageShow])
-            .onPopState(efs?[.onPopState])
-            .onResize(efs?[.onResize])
-            .onStorage(efs?[.onStorage])
-            .onUnload(efs?[.onUnload])
+            .onEvent(eventFuncs?[.onAfterPrint])
+            .onEvent(eventFuncs?[.onBeforePrint])
+            .onEvent(eventFuncs?[.onBeforeUnload])
+            .onEvent(eventFuncs?[.onError])
+            .onEvent(eventFuncs?[.onHashChange])
+            .onEvent(eventFuncs?[.onLoad])
+            .onEvent(eventFuncs?[.onMessage])
+            .onEvent(eventFuncs?[.onOffline])
+            .onEvent(eventFuncs?[.onOnline])
+            .onEvent(eventFuncs?[.onPageHide])
+            .onEvent(eventFuncs?[.onPageShow])
+            .onEvent(eventFuncs?[.onPopState])
+            .onEvent(eventFuncs?[.onResize])
+            .onEvent(eventFuncs?[.onStorage])
+            .onEvent(eventFuncs?[.onUnload])
     }
     
     public convenience init(scripts: [Script] = [],
@@ -50,33 +51,3 @@ open class Body: StandardTag {
         self.init(scripts: scripts, [builder()])
     }
 }
-
-extension Body {
-    
-    public enum BodyEvent: String {
-        case onAfterPrint   // run after the document is printed
-        case onBeforePrint  // run before the document is printed
-        case onBeforeUnload // run when the document is about to be unloaded
-        case onError        // run when an error occurs
-        case onHashChange   // run when there has been changes to the anchor part of the a URL
-        case onLoad         // fires after the page is finished loading
-        case onMessage      // run when the message is triggered
-        case onOffline      // run when the browser starts to work offline
-        case onOnline       // run when the browser starts to work online
-        case onPageHide     // run when a user navigates away from a page
-        case onPageShow     // run when a user navigates to a page
-        case onPopState     // run when the window's history changes
-        case onResize       // fires when the browser window is resized
-        case onStorage      // run when a Web Storage area is updated
-        case onUnload       // fires once a page has unloaded (or the browser window has been closed)
-    }
-    
-    public typealias JsFunction = String
-}
-
-extension Dictionary where Key == Body.BodyEvent, Value == [Body.JsFunction] {
-    
-    subscript(key: Key) -> String? {
-        self[key]?.joined(separator: ";\r")
-    }
-}

From 8ba79eaed7b8896a7bad448ecfb2b164d504c377 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:36:16 -0400
Subject: [PATCH 089/141] Tag > appendToAttribute() Event > onEvents()

---
 Sources/SwiftHtml/Attributes/Events.swift | 32 +++++------------------
 Sources/SwiftHtml/Tags/Body.swift         | 24 +++--------------
 Sources/SwiftSgml/Tag.swift               | 13 +++++++++
 3 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 0464aab..bff3201 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -95,33 +95,15 @@ public extension Tag {
         let function: JSFunction
     }
     
-    func onEvent(_ e: Event, function: JSFunction?, _ condition: Bool = true) -> Self {
+    @discardableResult
+    func onEvent(_ e: Event, _ function: JSFunction?, _ condition: Bool = true) -> Self {
         attribute(e.rawValue.lowercased(), function, condition)
     }
     
-    func onEvent(_ ef: EventFunction?, _ condition: Bool = true) -> Self {
-        guard let event = ef?.event else { return self }
-        return onEvent(event, function: ef?.function, condition)
-    }
-}
-
-extension Dictionary where Key == Tag.Event, Value == Tag.JSFunction {
-
-    // convert [EventFunction] to [Event:JSFunction] where JSFunctions combined with ";\r"
-    init(_ efs: [Tag.EventFunction]) {
-        self = [:]
-        _ = efs.map{
-            if let existing = self[$0.event] {
-                self[$0.event] = existing + ";\r" + $0.function
-            } else {
-                self[$0.event] = $0.function
-            }
-        }
-    }
-    
-    // retrieve from dictionary as Tag.EventFunction
-    subscript(key: Key) -> Tag.EventFunction? {
-        guard let value = self[key] else { return nil }
-        return Tag.EventFunction(event: key, function: value)
+    @discardableResult
+    func onEvents(_ efs: [EventFunction]?, condition: Bool = true) -> Self {
+        guard let efs = efs, condition else { return self }
+        _ = efs.map { appendToAttribute($0.event.rawValue, $0.function, separator: ";\r") }
+        return self
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index cae5b0a..0899693 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,35 +15,19 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
-    public private(set) var eventFuncs: [Event:JSFunction]?
+    public private(set) var eventFuncs: [EventFunction]?
     
     public init(scripts: [Script]? = nil,
-                eventFuncs efs: [EventFunction]? = nil,
+                eventFuncs: [EventFunction]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
-        // convert [EventFunction] to [Event:JSFunction]
-        self.eventFuncs = efs != nil ? .init(efs!) : nil
+        self.eventFuncs = eventFuncs
         let temp = Tag {
             if let children = children { children }
             if let scripts = scripts { scripts }
         }
         super.init(temp.children)
-        _ = self
-            .onEvent(eventFuncs?[.onAfterPrint])
-            .onEvent(eventFuncs?[.onBeforePrint])
-            .onEvent(eventFuncs?[.onBeforeUnload])
-            .onEvent(eventFuncs?[.onError])
-            .onEvent(eventFuncs?[.onHashChange])
-            .onEvent(eventFuncs?[.onLoad])
-            .onEvent(eventFuncs?[.onMessage])
-            .onEvent(eventFuncs?[.onOffline])
-            .onEvent(eventFuncs?[.onOnline])
-            .onEvent(eventFuncs?[.onPageHide])
-            .onEvent(eventFuncs?[.onPageShow])
-            .onEvent(eventFuncs?[.onPopState])
-            .onEvent(eventFuncs?[.onResize])
-            .onEvent(eventFuncs?[.onStorage])
-            .onEvent(eventFuncs?[.onUnload])
+        self.onEvents(eventFuncs)
     }
     
     public convenience init(scripts: [Script] = [],
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 2714c7d..2036500 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -105,6 +105,19 @@ open class Tag {
         return self
     }
     
+    @discardableResult
+    public func appendToAttribute(_ key: String, _ value: String?, separator: String? = nil, _ condition: Bool = true) -> Self {
+        guard condition else { return self }
+        let attribute: Attribute
+        if let existing = attributes?.first(where: { $0.key == key }) {
+            attribute = .init(key: key, value: (existing.value ?? "") + (separator ?? "") + (value ?? ""))
+        } else {
+            attribute = .init(key: key, value: value)
+        }
+        upsert(attribute)
+        return self
+    }
+    
     /// add a new attribute with a given value if the condition is true
     @discardableResult
     public func attribute(_ key: String, _ value: String?, _ condition: Bool = true) -> Self {

From 0639f5a2ea598b30ed8719c879f844f7351b1236 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:24:30 -0400
Subject: [PATCH 090/141] Move Event from Tag to Attribute

---
 Sources/SwiftHtml/Attributes/Events.swift | 9 ++++++---
 Sources/SwiftHtml/Tags/Body.swift         | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index bff3201..521e555 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 07. 23..
 //
 
-public extension Tag {
+public extension Attribute {
     
     typealias JSFunction = String
     
@@ -94,14 +94,17 @@ public extension Tag {
         let event: Event
         let function: JSFunction
     }
+}
+
+extension Tag {
     
     @discardableResult
-    func onEvent(_ e: Event, _ function: JSFunction?, _ condition: Bool = true) -> Self {
+    func onEvent(_ e: Attribute.Event, _ function: Attribute.JSFunction?, _ condition: Bool = true) -> Self {
         attribute(e.rawValue.lowercased(), function, condition)
     }
     
     @discardableResult
-    func onEvents(_ efs: [EventFunction]?, condition: Bool = true) -> Self {
+    func onEvents(_ efs: [Attribute.EventFunction]?, condition: Bool = true) -> Self {
         guard let efs = efs, condition else { return self }
         _ = efs.map { appendToAttribute($0.event.rawValue, $0.function, separator: ";\r") }
         return self
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 0899693..c4eac48 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,10 +15,10 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
-    public private(set) var eventFuncs: [EventFunction]?
+    public private(set) var eventFuncs: [Attribute.EventFunction]?
     
     public init(scripts: [Script]? = nil,
-                eventFuncs: [EventFunction]? = nil,
+                eventFuncs: [Attribute.EventFunction]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
         self.eventFuncs = eventFuncs

From 87b904171a2a44effaec41dcdab9e9f3aca9f833 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:26:58 -0400
Subject: [PATCH 091/141] Make Event extensions on Tag public

---
 Sources/SwiftHtml/Attributes/Events.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 521e555..cf8fd8c 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -96,7 +96,7 @@ public extension Attribute {
     }
 }
 
-extension Tag {
+public extension Tag {
     
     @discardableResult
     func onEvent(_ e: Attribute.Event, _ function: Attribute.JSFunction?, _ condition: Bool = true) -> Self {

From c17e27bc0f684d3d5f870118f83b0b845c783858 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:49:09 -0400
Subject: [PATCH 092/141] Update convenience init()

---
 Sources/SwiftHtml/Tags/Body.swift | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index c4eac48..1752554 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,23 +15,26 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
-    public private(set) var eventFuncs: [Attribute.EventFunction]?
+    public private(set) var eventFunctions: [Attribute.EventFunction]?
     
     public init(scripts: [Script]? = nil,
-                eventFuncs: [Attribute.EventFunction]? = nil,
+                eventFunctions: [Attribute.EventFunction]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
-        self.eventFuncs = eventFuncs
+        self.eventFunctions = eventFunctions
         let temp = Tag {
             if let children = children { children }
             if let scripts = scripts { scripts }
         }
         super.init(temp.children)
-        self.onEvents(eventFuncs)
+        self.onEvents(eventFunctions)
     }
     
     public convenience init(scripts: [Script] = [],
+                            eventFunctions: [Attribute.EventFunction]? = nil,
                             @TagBuilder _ builder: () -> Tag) {
-        self.init(scripts: scripts, [builder()])
+        self.init(scripts: scripts,
+                  eventFunctions: eventFunctions,
+                  [builder()])
     }
 }

From 870030fa03e83cc70787bf71b6151382d35d5cdc Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:00:47 -0400
Subject: [PATCH 093/141] Typo

---
 Sources/SwiftSgml/Tag.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 2036500..6edafe2 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -15,7 +15,7 @@ open class Tag {
         case standard   // <name></name>
     }
     
-    public let kind: Kind?    // type == nil only children rendered
+    public let kind: Kind?    // == nil only children rendered
     public let name: String
     public var contents: String?
     public internal(set) var attributes: [Attribute]?

From 3f6d30c4ce3ca53a9fb59cdfd1df1bfce1a67c1f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 11:17:10 -0400
Subject: [PATCH 094/141] Use String(describing:) to generate tag name from
 class name

---
 Sources/SwiftHtml/Tags/A.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Abbr.swift              |  2 +-
 Sources/SwiftHtml/Tags/Address.swift           |  2 +-
 Sources/SwiftHtml/Tags/Area.swift              |  2 +-
 Sources/SwiftHtml/Tags/Article.swift           |  2 +-
 Sources/SwiftHtml/Tags/Aside.swift             |  2 +-
 Sources/SwiftHtml/Tags/Audio.swift             |  2 +-
 Sources/SwiftHtml/Tags/B.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Base.swift              |  2 +-
 Sources/SwiftHtml/Tags/Bdi.swift               |  2 +-
 Sources/SwiftHtml/Tags/Bdo.swift               |  2 +-
 Sources/SwiftHtml/Tags/Blockquote.swift        |  2 +-
 Sources/SwiftHtml/Tags/Body.swift              |  2 +-
 Sources/SwiftHtml/Tags/Br.swift                |  2 +-
 Sources/SwiftHtml/Tags/Button.swift            |  2 +-
 Sources/SwiftHtml/Tags/Canvas.swift            |  2 +-
 Sources/SwiftHtml/Tags/Caption.swift           |  2 +-
 Sources/SwiftHtml/Tags/Cite.swift              |  2 +-
 Sources/SwiftHtml/Tags/Code.swift              |  2 +-
 Sources/SwiftHtml/Tags/Col.swift               |  2 +-
 Sources/SwiftHtml/Tags/Colgroup.swift          |  2 +-
 Sources/SwiftHtml/Tags/Comment.swift           |  2 +-
 Sources/SwiftHtml/Tags/Data.swift              |  2 +-
 Sources/SwiftHtml/Tags/Datalist.swift          |  2 +-
 Sources/SwiftHtml/Tags/Dd.swift                |  2 +-
 Sources/SwiftHtml/Tags/Del.swift               |  2 +-
 Sources/SwiftHtml/Tags/Details.swift           |  2 +-
 Sources/SwiftHtml/Tags/Dfn.swift               |  2 +-
 Sources/SwiftHtml/Tags/Dialog.swift            |  2 +-
 Sources/SwiftHtml/Tags/Div.swift               |  2 +-
 Sources/SwiftHtml/Tags/Dl.swift                |  2 +-
 Sources/SwiftHtml/Tags/Dt.swift                |  2 +-
 Sources/SwiftHtml/Tags/Em.swift                |  2 +-
 Sources/SwiftHtml/Tags/Embed.swift             |  2 +-
 Sources/SwiftHtml/Tags/Fieldset.swift          |  2 +-
 Sources/SwiftHtml/Tags/Figcaption.swift        |  2 +-
 Sources/SwiftHtml/Tags/Figure.swift            |  2 +-
 Sources/SwiftHtml/Tags/Footer.swift            |  2 +-
 Sources/SwiftHtml/Tags/Form.swift              |  2 +-
 Sources/SwiftHtml/Tags/H1.swift                |  2 +-
 Sources/SwiftHtml/Tags/H2.swift                |  2 +-
 Sources/SwiftHtml/Tags/H3.swift                |  2 +-
 Sources/SwiftHtml/Tags/H4.swift                |  2 +-
 Sources/SwiftHtml/Tags/H5.swift                |  2 +-
 Sources/SwiftHtml/Tags/H6.swift                |  2 +-
 Sources/SwiftHtml/Tags/Head.swift              |  2 +-
 Sources/SwiftHtml/Tags/Header.swift            |  2 +-
 Sources/SwiftHtml/Tags/Hr.swift                |  2 +-
 Sources/SwiftHtml/Tags/Html.swift              |  2 +-
 Sources/SwiftHtml/Tags/I.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Iframe.swift            |  2 +-
 Sources/SwiftHtml/Tags/Img.swift               |  2 +-
 Sources/SwiftHtml/Tags/Input.swift             |  2 +-
 Sources/SwiftHtml/Tags/Ins.swift               |  2 +-
 Sources/SwiftHtml/Tags/Kbd.swift               |  2 +-
 Sources/SwiftHtml/Tags/Label.swift             |  2 +-
 Sources/SwiftHtml/Tags/Legend.swift            |  2 +-
 Sources/SwiftHtml/Tags/Li.swift                |  2 +-
 Sources/SwiftHtml/Tags/Link.swift              |  2 +-
 Sources/SwiftHtml/Tags/MainTag.swift           |  2 +-
 Sources/SwiftHtml/Tags/Map.swift               |  2 +-
 Sources/SwiftHtml/Tags/Mark.swift              |  2 +-
 Sources/SwiftHtml/Tags/Meta.swift              |  2 +-
 Sources/SwiftHtml/Tags/Meter.swift             |  2 +-
 Sources/SwiftHtml/Tags/Nav.swift               |  2 +-
 Sources/SwiftHtml/Tags/Noscript.swift          |  2 +-
 Sources/SwiftHtml/Tags/Object.swift            |  2 +-
 Sources/SwiftHtml/Tags/Ol.swift                |  2 +-
 Sources/SwiftHtml/Tags/Optgroup.swift          |  2 +-
 Sources/SwiftHtml/Tags/Option.swift            |  2 +-
 Sources/SwiftHtml/Tags/Output.swift            |  2 +-
 Sources/SwiftHtml/Tags/P.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Param.swift             |  2 +-
 Sources/SwiftHtml/Tags/Picture.swift           |  2 +-
 Sources/SwiftHtml/Tags/Pre.swift               |  2 +-
 Sources/SwiftHtml/Tags/Progress.swift          |  2 +-
 Sources/SwiftHtml/Tags/Q.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Rp.swift                |  2 +-
 Sources/SwiftHtml/Tags/Rt.swift                |  2 +-
 Sources/SwiftHtml/Tags/Ruby.swift              |  2 +-
 Sources/SwiftHtml/Tags/S.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Samp.swift              |  2 +-
 Sources/SwiftHtml/Tags/Script.swift            |  2 +-
 Sources/SwiftHtml/Tags/Section.swift           |  2 +-
 Sources/SwiftHtml/Tags/Select.swift            |  2 +-
 Sources/SwiftHtml/Tags/Small.swift             |  2 +-
 Sources/SwiftHtml/Tags/Source.swift            |  2 +-
 Sources/SwiftHtml/Tags/Span.swift              |  2 +-
 Sources/SwiftHtml/Tags/Strong.swift            |  2 +-
 Sources/SwiftHtml/Tags/Style.swift             |  2 +-
 Sources/SwiftHtml/Tags/Sub.swift               |  2 +-
 Sources/SwiftHtml/Tags/Summary.swift           |  2 +-
 Sources/SwiftHtml/Tags/Sup.swift               |  2 +-
 Sources/SwiftHtml/Tags/Table.swift             |  2 +-
 Sources/SwiftHtml/Tags/Tbody.swift             |  2 +-
 Sources/SwiftHtml/Tags/Td.swift                |  2 +-
 Sources/SwiftHtml/Tags/Template.swift          |  2 +-
 Sources/SwiftHtml/Tags/Textarea.swift          |  2 +-
 Sources/SwiftHtml/Tags/Tfoot.swift             |  2 +-
 Sources/SwiftHtml/Tags/Th.swift                |  2 +-
 Sources/SwiftHtml/Tags/Thead.swift             |  2 +-
 Sources/SwiftHtml/Tags/Time.swift              |  2 +-
 Sources/SwiftHtml/Tags/Title.swift             |  2 +-
 Sources/SwiftHtml/Tags/Tr.swift                |  2 +-
 Sources/SwiftHtml/Tags/Track.swift             |  2 +-
 Sources/SwiftHtml/Tags/U.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Ul.swift                |  2 +-
 Sources/SwiftHtml/Tags/Var.swift               |  2 +-
 Sources/SwiftHtml/Tags/Video.swift             |  2 +-
 Sources/SwiftHtml/Tags/Wbr.swift               |  2 +-
 Sources/SwiftRss/Channel.swift                 |  2 +-
 Sources/SwiftRss/Description.swift             |  2 +-
 Sources/SwiftRss/Guid.swift                    |  2 +-
 Sources/SwiftRss/Item.swift                    |  2 +-
 Sources/SwiftRss/Language.swift                |  2 +-
 Sources/SwiftRss/Link.swift                    |  2 +-
 Sources/SwiftRss/Rss.swift                     |  2 +-
 Sources/SwiftRss/Title.swift                   |  2 +-
 Sources/SwiftRss/Ttl.swift                     |  2 +-
 Sources/SwiftSgml/Tag.swift                    | 10 +---------
 Sources/SwiftSitemap/ChangeFreq.swift          |  2 +-
 Sources/SwiftSitemap/LastMod.swift             |  2 +-
 Sources/SwiftSitemap/Loc.swift                 |  2 +-
 Sources/SwiftSitemap/Priority.swift            |  2 +-
 Sources/SwiftSitemap/Sitemap.swift             |  2 +-
 Sources/SwiftSitemap/SitemapIndex.swift        |  2 +-
 Sources/SwiftSitemap/Url.swift                 |  2 +-
 Sources/SwiftSitemap/UrlSet.swift              |  2 +-
 Sources/SwiftSvg/Circle.swift                  |  2 +-
 Sources/SwiftSvg/Ellipse.swift                 |  2 +-
 Sources/SwiftSvg/Line.swift                    |  2 +-
 Sources/SwiftSvg/Path.swift                    |  2 +-
 Sources/SwiftSvg/Polygon.swift                 |  2 +-
 Sources/SwiftSvg/Polyline.swift                |  2 +-
 Sources/SwiftSvg/Rect.swift                    |  2 +-
 Sources/SwiftSvg/Svg.swift                     |  2 +-
 Tests/SwiftHtmlTests/TagCompositionTests.swift |  2 +-
 137 files changed, 137 insertions(+), 145 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index d15e091..8a2e75a 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -16,7 +16,7 @@
 /// - An active link is underlined and red
 open class A: StandardTag {
     
-    override open class var name: String { .init(A.self) }
+    override open class var name: String { .init(describing: A.self).lowercased() }
 }
 
 public extension A {
diff --git a/Sources/SwiftHtml/Tags/Abbr.swift b/Sources/SwiftHtml/Tags/Abbr.swift
index 62346b9..ccc67e0 100644
--- a/Sources/SwiftHtml/Tags/Abbr.swift
+++ b/Sources/SwiftHtml/Tags/Abbr.swift
@@ -10,6 +10,6 @@
 /// **Tip:** Use the global title attribute to show the description for the abbreviation/acronym when you mouse over the element.
 open class Abbr: StandardTag {
     
-    override open class var name: String { .init(Abbr.self) }
+    override open class var name: String { .init(describing: Abbr.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Address.swift b/Sources/SwiftHtml/Tags/Address.swift
index c80ed74..a91a04d 100644
--- a/Sources/SwiftHtml/Tags/Address.swift
+++ b/Sources/SwiftHtml/Tags/Address.swift
@@ -12,5 +12,5 @@
 /// The text in the `<address>` element usually renders in italic, and browsers will always add a line break before and after the `<address>` element.
 open class Address: StandardTag {
     
-    override open class var name: String { .init(Address.self) }
+    override open class var name: String { .init(describing: Address.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index f76c58c..d4019c4 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -51,7 +51,7 @@ open class Area: EmptyTag {
         case poly
     }
     
-    override open class var name: String { .init(Area.self) }    
+    override open class var name: String { .init(describing: Area.self).lowercased() }
 }
 
 public extension Area {
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index 87eaf45..1598a07 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -20,6 +20,6 @@
 /// However, you can use CSS to style the `<article>` element (see example below).
 open class Article: StandardTag {
     
-    override open class var name: String { .init(Article.self) }
+    override open class var name: String { .init(describing: Article.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Aside.swift b/Sources/SwiftHtml/Tags/Aside.swift
index 8e892c4..77f8a4f 100644
--- a/Sources/SwiftHtml/Tags/Aside.swift
+++ b/Sources/SwiftHtml/Tags/Aside.swift
@@ -15,6 +15,6 @@
 /// However, you can use CSS to style the `<aside>` element (see example below).
 open class Aside: StandardTag {
     
-    override open class var name: String { .init(Aside.self) }
+    override open class var name: String { .init(describing: Aside.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Audio.swift b/Sources/SwiftHtml/Tags/Audio.swift
index 45cf4a4..01d81ab 100644
--- a/Sources/SwiftHtml/Tags/Audio.swift
+++ b/Sources/SwiftHtml/Tags/Audio.swift
@@ -23,7 +23,7 @@
 ///      *From Edge 79
 open class Audio: StandardTag {
     
-    override open class var name: String { .init(Audio.self) }
+    override open class var name: String { .init(describing: Audio.self).lowercased() }
 }
 
 public extension Audio {
diff --git a/Sources/SwiftHtml/Tags/B.swift b/Sources/SwiftHtml/Tags/B.swift
index 3bed16f..281b5b4 100644
--- a/Sources/SwiftHtml/Tags/B.swift
+++ b/Sources/SwiftHtml/Tags/B.swift
@@ -8,5 +8,5 @@
 /// Make some text bold (without marking it as important)
 open class B: StandardTag {
     
-    override open class var name: String { .init(B.self) }
+    override open class var name: String { .init(describing: B.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index d7515f6..28d5562 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -12,7 +12,7 @@
 /// There can only be one single `<base>` element in a document, and it must be inside the `<head>` element.
 open class Base: EmptyTag {
     
-    override open class var name: String { .init(Base.self) }
+    override open class var name: String { .init(describing: Base.self).lowercased() }
 }
 
 public extension Base {
diff --git a/Sources/SwiftHtml/Tags/Bdi.swift b/Sources/SwiftHtml/Tags/Bdi.swift
index 6a3d7d7..c7657c7 100644
--- a/Sources/SwiftHtml/Tags/Bdi.swift
+++ b/Sources/SwiftHtml/Tags/Bdi.swift
@@ -12,5 +12,5 @@
 /// This element is useful when embedding user-generated content with an unknown text direction.
 open class Bdi: StandardTag {
     
-    override open class var name: String { .init(Bdi.self) }
+    override open class var name: String { .init(describing: Bdi.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Bdo.swift b/Sources/SwiftHtml/Tags/Bdo.swift
index 5e96567..09c2dcf 100644
--- a/Sources/SwiftHtml/Tags/Bdo.swift
+++ b/Sources/SwiftHtml/Tags/Bdo.swift
@@ -10,7 +10,7 @@
 /// The `<bdo>` tag is used to override the current text direction.
 open class Bdo: StandardTag {
     
-    override open class var name: String { .init(Bdo.self) }
+    override open class var name: String { .init(describing: Bdo.self).lowercased() }
     
     public init(_ contents: String, dir: TextDirection = .ltr) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Blockquote.swift b/Sources/SwiftHtml/Tags/Blockquote.swift
index fccd2dc..d4cf095 100644
--- a/Sources/SwiftHtml/Tags/Blockquote.swift
+++ b/Sources/SwiftHtml/Tags/Blockquote.swift
@@ -10,7 +10,7 @@
 /// Browsers usually indent `<blockquote>` elements (look at example below to see how to remove the indentation).
 open class Blockquote: StandardTag {
     
-    override open class var name: String { .init(Blockquote.self) }
+    override open class var name: String { .init(describing: Blockquote.self).lowercased() }
 }
 
 public extension Blockquote {
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 1752554..7636836 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -12,7 +12,7 @@
 /// **Note:** There can only be one `<body>` element in an HTML document.
 open class Body: StandardTag {
     
-    override open class var name: String { .init(Body.self) }
+    override open class var name: String { .init(describing: Body.self).lowercased() }
     
     public private(set) var scripts: [Script]?
     public private(set) var eventFunctions: [Attribute.EventFunction]?
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index 8fffe30..56989e9 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -12,5 +12,5 @@
 /// The `<br>` tag is an empty tag which means that it has no end tag.
 open class Br: EmptyTag {
     
-    override open class var name: String { .init(Br.self) }    
+    override open class var name: String { .init(describing: Br.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Button.swift b/Sources/SwiftHtml/Tags/Button.swift
index 9cb8cfe..f80be38 100644
--- a/Sources/SwiftHtml/Tags/Button.swift
+++ b/Sources/SwiftHtml/Tags/Button.swift
@@ -14,7 +14,7 @@
 /// **Tip:** You can easily style buttons with CSS! Look at the examples below or visit our CSS Buttons tutorial.
 open class Button: StandardTag {
     
-    override open class var name: String { .init(Button.self) }
+    override open class var name: String { .init(describing: Button.self).lowercased() }
 }
 
 public extension Button {
diff --git a/Sources/SwiftHtml/Tags/Canvas.swift b/Sources/SwiftHtml/Tags/Canvas.swift
index 4b1c7ce..2d3857d 100644
--- a/Sources/SwiftHtml/Tags/Canvas.swift
+++ b/Sources/SwiftHtml/Tags/Canvas.swift
@@ -12,7 +12,7 @@
 /// Any text inside the `<canvas>` element will be displayed in browsers with JavaScript disabled and in browsers that do not support <canvas>.
 open class Canvas: StandardTag {
     
-    override open class var name: String { .init(Canvas.self) }
+    override open class var name: String { .init(describing: Canvas.self).lowercased() }
 }
 
 public extension Canvas {
diff --git a/Sources/SwiftHtml/Tags/Caption.swift b/Sources/SwiftHtml/Tags/Caption.swift
index 65facd7..bbbbffc 100644
--- a/Sources/SwiftHtml/Tags/Caption.swift
+++ b/Sources/SwiftHtml/Tags/Caption.swift
@@ -12,5 +12,5 @@
 /// **Tip:** By default, a table caption will be center-aligned above a table. However, the CSS properties text-align and caption-side can be used to align and place the caption.
 open class Caption: StandardTag {
     
-    override open class var name: String { .init(Caption.self) }
+    override open class var name: String { .init(describing: Caption.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Cite.swift b/Sources/SwiftHtml/Tags/Cite.swift
index a5bcb24..46c512b 100644
--- a/Sources/SwiftHtml/Tags/Cite.swift
+++ b/Sources/SwiftHtml/Tags/Cite.swift
@@ -12,5 +12,5 @@
 /// The text in the `<cite>` element usually renders in italic.
 open class Cite: StandardTag {
     
-    override open class var name: String { .init(Cite.self) }
+    override open class var name: String { .init(describing: Cite.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Code.swift b/Sources/SwiftHtml/Tags/Code.swift
index e116554..c87ea1e 100644
--- a/Sources/SwiftHtml/Tags/Code.swift
+++ b/Sources/SwiftHtml/Tags/Code.swift
@@ -16,5 +16,5 @@
 /// - `<pre>`    Defines preformatted text
 open class Code: StandardTag {
     
-    override open class var name: String { .init(Code.self) }
+    override open class var name: String { .init(describing: Code.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index 8abe598..6f81460 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -10,7 +10,7 @@
 /// The `<col>` tag is useful for applying styles to entire columns, instead of repeating the styles for each cell, for each row.
 open class Col: EmptyTag {
     
-    override open class var name: String { .init(Col.self) }
+    override open class var name: String { .init(describing: Col.self).lowercased() }
 }
 
 public extension Col {
diff --git a/Sources/SwiftHtml/Tags/Colgroup.swift b/Sources/SwiftHtml/Tags/Colgroup.swift
index b6140a1..f650119 100644
--- a/Sources/SwiftHtml/Tags/Colgroup.swift
+++ b/Sources/SwiftHtml/Tags/Colgroup.swift
@@ -14,7 +14,7 @@
 /// **Tip:** To define different properties to a column within a `<colgroup>`, use the `<col>` tag within the `<colgroup>` tag.
 open class Colgroup: StandardTag {
     
-    override open class var name: String { .init(Colgroup.self) }
+    override open class var name: String { .init(describing: Colgroup.self).lowercased() }
 }
 
 public extension Colgroup {
diff --git a/Sources/SwiftHtml/Tags/Comment.swift b/Sources/SwiftHtml/Tags/Comment.swift
index a44eeeb..6bfae51 100644
--- a/Sources/SwiftHtml/Tags/Comment.swift
+++ b/Sources/SwiftHtml/Tags/Comment.swift
@@ -14,7 +14,7 @@
 /// This is especially useful if you have a lot of code.
 open class Comment: CommentTag {
     
-    override open class var name: String { .init(Comment.self) }
+    override open class var name: String { .init(describing: Comment.self).lowercased() }
     
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Data.swift b/Sources/SwiftHtml/Tags/Data.swift
index e8cd289..f231058 100644
--- a/Sources/SwiftHtml/Tags/Data.swift
+++ b/Sources/SwiftHtml/Tags/Data.swift
@@ -12,7 +12,7 @@
 /// **Tip:** If the content is time- or date-related, use the `<time>` element instead.
 open class Data: StandardTag {
     
-    override open class var name: String { .init(Data.self) }
+    override open class var name: String { .init(describing: Data.self).lowercased() }
 }
 
 public extension Data {
diff --git a/Sources/SwiftHtml/Tags/Datalist.swift b/Sources/SwiftHtml/Tags/Datalist.swift
index c8fc437..7d76c41 100644
--- a/Sources/SwiftHtml/Tags/Datalist.swift
+++ b/Sources/SwiftHtml/Tags/Datalist.swift
@@ -12,5 +12,5 @@
 /// The `<datalist>` element's id attribute must be equal to the `<input>` element's list attribute (this binds them together).
 open class Datalist: StandardTag {
     
-    override open class var name: String { .init(Datalist.self) }
+    override open class var name: String { .init(describing: Datalist.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Dd.swift b/Sources/SwiftHtml/Tags/Dd.swift
index 6dca905..8d7bc9e 100644
--- a/Sources/SwiftHtml/Tags/Dd.swift
+++ b/Sources/SwiftHtml/Tags/Dd.swift
@@ -12,5 +12,5 @@
 /// Inside a `<dd>` tag you can put paragraphs, line breaks, images, links, lists, etc.
 open class Dd: StandardTag {
     
-    override open class var name: String { .init(Dd.self) }
+    override open class var name: String { .init(describing: Dd.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Del.swift b/Sources/SwiftHtml/Tags/Del.swift
index 74de00c..ac3e11d 100644
--- a/Sources/SwiftHtml/Tags/Del.swift
+++ b/Sources/SwiftHtml/Tags/Del.swift
@@ -10,7 +10,7 @@
 /// Browsers will usually strike a line through deleted text.
 open class Del: StandardTag {
     
-    override open class var name: String { .init(Del.self) }
+    override open class var name: String { .init(describing: Del.self).lowercased() }
 }
 
 public extension Del {
diff --git a/Sources/SwiftHtml/Tags/Details.swift b/Sources/SwiftHtml/Tags/Details.swift
index 1b532ca..771afca 100644
--- a/Sources/SwiftHtml/Tags/Details.swift
+++ b/Sources/SwiftHtml/Tags/Details.swift
@@ -14,7 +14,7 @@
 /// **Tip:** The `<summary>` tag is used in conjuction with `<details>` to specify a visible heading for the details.
 open class Details: StandardTag {
     
-    override open class var name: String { .init(Details.self) }
+    override open class var name: String { .init(describing: Details.self).lowercased() }
 }
 
 public extension Details {
diff --git a/Sources/SwiftHtml/Tags/Dfn.swift b/Sources/SwiftHtml/Tags/Dfn.swift
index e8ec7dc..41d558e 100644
--- a/Sources/SwiftHtml/Tags/Dfn.swift
+++ b/Sources/SwiftHtml/Tags/Dfn.swift
@@ -13,5 +13,5 @@
 /// `<p><dfn>HTML</dfn> is the standard markup language for creating web pages.</p>`
 open class Dfn: StandardTag {
     
-    override open class var name: String { .init(Dfn.self) }
+    override open class var name: String { .init(describing: Dfn.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Dialog.swift b/Sources/SwiftHtml/Tags/Dialog.swift
index 4fda5c3..abd8ca2 100644
--- a/Sources/SwiftHtml/Tags/Dialog.swift
+++ b/Sources/SwiftHtml/Tags/Dialog.swift
@@ -10,7 +10,7 @@
 /// The `<dialog>` element makes it easy to create popup dialogs and modals on a web page.
 open class Dialog: StandardTag {
     
-    override open class var name: String { .init(Dialog.self) }
+    override open class var name: String { .init(describing: Dialog.self).lowercased() }
 }
 
 public extension Dialog {
diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index fbeaf70..4c129e8 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -16,7 +16,7 @@
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
 open class Div: StandardTag {
     
-    override open class var name: String { .init(Div.self) }
+    override open class var name: String { .init(describing: Div.self).lowercased() }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Dl.swift b/Sources/SwiftHtml/Tags/Dl.swift
index 23a264f..ab1d685 100644
--- a/Sources/SwiftHtml/Tags/Dl.swift
+++ b/Sources/SwiftHtml/Tags/Dl.swift
@@ -10,5 +10,5 @@
 /// The `<dl>` tag is used in conjunction with `<dt>` (defines terms/names) and `<dd>` (describes each term/name).
 open class Dl: StandardTag {
     
-    override open class var name: String { .init(Dl.self) }
+    override open class var name: String { .init(describing: Dl.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Dt.swift b/Sources/SwiftHtml/Tags/Dt.swift
index e40ab83..76812f1 100644
--- a/Sources/SwiftHtml/Tags/Dt.swift
+++ b/Sources/SwiftHtml/Tags/Dt.swift
@@ -10,5 +10,5 @@
 /// The `<dt>` tag is used in conjunction with `<dl>` (defines a description list) and `<dd>` (describes each term/name).
 open class Dt: StandardTag {
     
-    override open class var name: String { .init(Dt.self) }
+    override open class var name: String { .init(describing: Dt.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Em.swift b/Sources/SwiftHtml/Tags/Em.swift
index 88ccfb5..f40669b 100644
--- a/Sources/SwiftHtml/Tags/Em.swift
+++ b/Sources/SwiftHtml/Tags/Em.swift
@@ -10,5 +10,5 @@
 /// A screen reader will pronounce the words in `<em>` with an emphasis, using verbal stress.
 open class Em: StandardTag {
     
-    override open class var name: String { .init(Em.self) }
+    override open class var name: String { .init(describing: Em.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index 87366ee..33fffea 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -8,7 +8,7 @@
 /// The `<embed>` tag defines a container for an external resource, such as a web page, a picture, a media player, or a plug-in application.
 open class Embed: EmptyTag {
     
-    override open class var name: String { .init(Embed.self) }
+    override open class var name: String { .init(describing: Embed.self).lowercased() }
 }
 
 public extension Embed {
diff --git a/Sources/SwiftHtml/Tags/Fieldset.swift b/Sources/SwiftHtml/Tags/Fieldset.swift
index 3fa2c3c..63976f0 100644
--- a/Sources/SwiftHtml/Tags/Fieldset.swift
+++ b/Sources/SwiftHtml/Tags/Fieldset.swift
@@ -10,7 +10,7 @@
 /// The `<fieldset>` tag draws a box around the related elements.
 open class Fieldset: StandardTag {
     
-    override open class var name: String { .init(Fieldset.self) }
+    override open class var name: String { .init(describing: Fieldset.self).lowercased() }
 }
 
 public extension Fieldset {
diff --git a/Sources/SwiftHtml/Tags/Figcaption.swift b/Sources/SwiftHtml/Tags/Figcaption.swift
index d0b9582..a1504fe 100644
--- a/Sources/SwiftHtml/Tags/Figcaption.swift
+++ b/Sources/SwiftHtml/Tags/Figcaption.swift
@@ -10,5 +10,5 @@
 /// The `<figcaption>` element can be placed as the first or last child of the `<figure>` element.
 open class Figcaption: StandardTag {
     
-    override open class var name: String { .init(Figcaption.self) }
+    override open class var name: String { .init(describing: Figcaption.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Figure.swift b/Sources/SwiftHtml/Tags/Figure.swift
index 9e499f6..cadeeae 100644
--- a/Sources/SwiftHtml/Tags/Figure.swift
+++ b/Sources/SwiftHtml/Tags/Figure.swift
@@ -12,6 +12,6 @@
 /// **Tip:** The `<figcaption>` element is used to add a caption for the `<figure>` element.
 open class Figure: StandardTag {
     
-    override open class var name: String { .init(Figure.self) }
+    override open class var name: String { .init(describing: Figure.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Footer.swift b/Sources/SwiftHtml/Tags/Footer.swift
index d9af9fd..d3acd7c 100644
--- a/Sources/SwiftHtml/Tags/Footer.swift
+++ b/Sources/SwiftHtml/Tags/Footer.swift
@@ -18,5 +18,5 @@
 /// You can have several `<footer>` elements in one document.
 open class Footer: StandardTag {
     
-    override open class var name: String { .init(Footer.self) }
+    override open class var name: String { .init(describing: Footer.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Form.swift b/Sources/SwiftHtml/Tags/Form.swift
index 1d6f60b..55fd824 100644
--- a/Sources/SwiftHtml/Tags/Form.swift
+++ b/Sources/SwiftHtml/Tags/Form.swift
@@ -20,7 +20,7 @@
 /// - `<output>`
 open class Form: StandardTag {
     
-    override open class var name: String { .init(Form.self) }
+    override open class var name: String { .init(describing: Form.self).lowercased() }
 }
 
 public extension Form {
diff --git a/Sources/SwiftHtml/Tags/H1.swift b/Sources/SwiftHtml/Tags/H1.swift
index 02fffe9..8f21bb4 100644
--- a/Sources/SwiftHtml/Tags/H1.swift
+++ b/Sources/SwiftHtml/Tags/H1.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H1: StandardTag {
     
-    override open class var name: String { .init(H1.self) }
+    override open class var name: String { .init(describing: H1.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H2.swift b/Sources/SwiftHtml/Tags/H2.swift
index 1e67cc3..e9c4934 100644
--- a/Sources/SwiftHtml/Tags/H2.swift
+++ b/Sources/SwiftHtml/Tags/H2.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H2: StandardTag {
     
-    override open class var name: String { .init(H2.self) }
+    override open class var name: String { .init(describing: H2.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H3.swift b/Sources/SwiftHtml/Tags/H3.swift
index 8e3e911..b38d006 100644
--- a/Sources/SwiftHtml/Tags/H3.swift
+++ b/Sources/SwiftHtml/Tags/H3.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H3: StandardTag {
     
-    override open class var name: String { .init(H3.self) }
+    override open class var name: String { .init(describing: H3.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H4.swift b/Sources/SwiftHtml/Tags/H4.swift
index a28935a..2cf3b66 100644
--- a/Sources/SwiftHtml/Tags/H4.swift
+++ b/Sources/SwiftHtml/Tags/H4.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H4: StandardTag {
     
-    override open class var name: String { .init(H4.self) }
+    override open class var name: String { .init(describing: H4.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H5.swift b/Sources/SwiftHtml/Tags/H5.swift
index 13596a7..fb5fb92 100644
--- a/Sources/SwiftHtml/Tags/H5.swift
+++ b/Sources/SwiftHtml/Tags/H5.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H5: StandardTag {
     
-    override open class var name: String { .init(H5.self) }
+    override open class var name: String { .init(describing: H5.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H6.swift b/Sources/SwiftHtml/Tags/H6.swift
index f1e28ea..7ba4f95 100644
--- a/Sources/SwiftHtml/Tags/H6.swift
+++ b/Sources/SwiftHtml/Tags/H6.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H6: StandardTag {
     
-    override open class var name: String { .init(H6.self) }
+    override open class var name: String { .init(describing: H6.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index ecba7f1..f451120 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -22,7 +22,7 @@
 /// - `<noscript>`
 open class Head: StandardTag {
     
-    override open class var name: String { .init(Head.self) }
+    override open class var name: String { .init(describing: Head.self).lowercased() }
     
     public private(set) var title: Title?
     public private(set) var styles: [Style]?
diff --git a/Sources/SwiftHtml/Tags/Header.swift b/Sources/SwiftHtml/Tags/Header.swift
index c493e39..de79b24 100644
--- a/Sources/SwiftHtml/Tags/Header.swift
+++ b/Sources/SwiftHtml/Tags/Header.swift
@@ -15,6 +15,6 @@
 /// **Note:** You can have several` <header>` elements in one HTML document. However,` <header>` cannot be placed within a` <footer>`,` <address>` or another` <header>` element.
 open class Header: StandardTag {
     
-    override open class var name: String { .init(Header.self) }
+    override open class var name: String { .init(describing: Header.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index 8f9e65e..091855c 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -10,5 +10,5 @@
 /// The `<hr>` element is most often displayed as a horizontal rule that is used to separate content (or define a change) in an HTML page.
 open class Hr: EmptyTag {
     
-    override open class var name: String { .init(Hr.self) }
+    override open class var name: String { .init(describing: Hr.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 3922c41..148f7f4 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -12,7 +12,7 @@
 /// **Note:** You should always include the lang attribute inside the `<html>` tag, to declare the language of the Web page. This is meant to assist search engines and browsers.
 open class Html: StandardTag {
     
-    override open class var name: String { .init(Html.self) }
+    override open class var name: String { .init(describing: Html.self).lowercased() }
 }
 
 public extension Html {
diff --git a/Sources/SwiftHtml/Tags/I.swift b/Sources/SwiftHtml/Tags/I.swift
index 3d870b6..b4a8dd0 100644
--- a/Sources/SwiftHtml/Tags/I.swift
+++ b/Sources/SwiftHtml/Tags/I.swift
@@ -18,5 +18,5 @@
 /// - `<dfn>` (a definition term)
 open class I: StandardTag {
     
-    override open class var name: String { .init(I.self) }
+    override open class var name: String { .init(describing: I.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Iframe.swift b/Sources/SwiftHtml/Tags/Iframe.swift
index 155c2a7..7a1a64f 100644
--- a/Sources/SwiftHtml/Tags/Iframe.swift
+++ b/Sources/SwiftHtml/Tags/Iframe.swift
@@ -14,7 +14,7 @@
 /// **Tip:** It is a good practice to always include a title attribute for the `<iframe>`. This is used by screen readers to read out what the content of the `<iframe>` is.
 open class Iframe: StandardTag {
     
-    override open class var name: String { .init(Iframe.self) }
+    override open class var name: String { .init(describing: Iframe.self).lowercased() }
 }
 
 public extension Iframe {
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index 6306c6a..62e5480 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -20,7 +20,7 @@
 /// **Tip:** To link an image to another document, simply nest the `<img>` tag inside an `<a>` tag (see example below).
 open class Img: EmptyTag {
     
-    override open class var name: String { .init(Img.self) }
+    override open class var name: String { .init(describing: Img.self).lowercased() }
     
     public init(src: String, alt: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index 691628d..fadf938 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -12,7 +12,7 @@
 /// The `<input>` element can be displayed in several ways, depending on the type attribute.
 open class Input: EmptyTag {
     
-    override open class var name: String { .init(Input.self) }
+    override open class var name: String { .init(describing: Input.self).lowercased() }
 }
 
 public extension Input {
diff --git a/Sources/SwiftHtml/Tags/Ins.swift b/Sources/SwiftHtml/Tags/Ins.swift
index 21a32fd..903b493 100644
--- a/Sources/SwiftHtml/Tags/Ins.swift
+++ b/Sources/SwiftHtml/Tags/Ins.swift
@@ -10,5 +10,5 @@
 /// **Tip:** Also look at the `<del>` tag to markup deleted text.
 open class Ins: StandardTag {
     
-    override open class var name: String { .init(Ins.self) }
+    override open class var name: String { .init(describing: Ins.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Kbd.swift b/Sources/SwiftHtml/Tags/Kbd.swift
index aa30015..3fe1940 100644
--- a/Sources/SwiftHtml/Tags/Kbd.swift
+++ b/Sources/SwiftHtml/Tags/Kbd.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS (see example below).
 open class Kbd: StandardTag {
     
-    override open class var name: String { .init(Kbd.self) }
+    override open class var name: String { .init(describing: Kbd.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Label.swift b/Sources/SwiftHtml/Tags/Label.swift
index 738f1fc..ba5255c 100644
--- a/Sources/SwiftHtml/Tags/Label.swift
+++ b/Sources/SwiftHtml/Tags/Label.swift
@@ -35,7 +35,7 @@
 /// Users who have difficulty clicking on very small regions (such as checkboxes) - because when a user clicks the text within the `<label>` element, it toggles the input (this increases the hit area).
 open class Label: StandardTag {
     
-    override open class var name: String { .init(Label.self) }
+    override open class var name: String { .init(describing: Label.self).lowercased() }
 }
 
 public extension Label {
diff --git a/Sources/SwiftHtml/Tags/Legend.swift b/Sources/SwiftHtml/Tags/Legend.swift
index ede96b4..063e715 100644
--- a/Sources/SwiftHtml/Tags/Legend.swift
+++ b/Sources/SwiftHtml/Tags/Legend.swift
@@ -8,5 +8,5 @@
 /// The `<legend>` tag defines a caption for the `<fieldset>` element.
 open class Legend: StandardTag {
     
-    override open class var name: String { .init(Legend.self) }
+    override open class var name: String { .init(describing: Legend.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Li.swift b/Sources/SwiftHtml/Tags/Li.swift
index e9d3aea..c8959dc 100644
--- a/Sources/SwiftHtml/Tags/Li.swift
+++ b/Sources/SwiftHtml/Tags/Li.swift
@@ -16,7 +16,7 @@
 /// **Tip:** Use CSS to style lists.
 open class Li: StandardTag {
     
-    override open class var name: String { .init(Li.self) }
+    override open class var name: String { .init(describing: Li.self).lowercased() }
 }
 
 public extension Li {
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index aa94b3a..d65c174 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -12,7 +12,7 @@
 /// The `<link>` element is an empty element, it contains attributes only.
 open class Link: EmptyTag {
     
-    override open class var name: String { .init(Link.self) }
+    override open class var name: String { .init(describing: Link.self).lowercased() }
     
     public init(rel: Rel) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/MainTag.swift b/Sources/SwiftHtml/Tags/MainTag.swift
index aeb8178..da27bd0 100644
--- a/Sources/SwiftHtml/Tags/MainTag.swift
+++ b/Sources/SwiftHtml/Tags/MainTag.swift
@@ -12,7 +12,7 @@
 /// **Note:** There must not be more than one `<main>` element in a document. The `<main>` element must NOT be a descendant of an `<article>`, `<aside>`, `<footer>`, `<header>`, or `<nav>` element.
 open class Main: StandardTag {
     
-    override open class var name: String { .init(Main.self) }
+    override open class var name: String { .init(describing: Main.self).lowercased() }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index 8aa8483..ae02f3c 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -12,7 +12,7 @@
 /// The `<map>` element contains a number of `<area>` elements, that defines the clickable areas in the image map.
 open class Map: StandardTag {
     
-    override open class var name: String { .init(Map.self) }
+    override open class var name: String { .init(describing: Map.self).lowercased() }
         
     public init(name: String, @TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
diff --git a/Sources/SwiftHtml/Tags/Mark.swift b/Sources/SwiftHtml/Tags/Mark.swift
index 6f26d13..7430fe2 100644
--- a/Sources/SwiftHtml/Tags/Mark.swift
+++ b/Sources/SwiftHtml/Tags/Mark.swift
@@ -8,5 +8,5 @@
 /// The `<mark>` tag defines text that should be marked or highlighted.
 open class Mark: StandardTag {
     
-    override open class var name: String { .init(Mark.self) }
+    override open class var name: String { .init(describing: Mark.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index 52e14ae..0b576c2 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -16,7 +16,7 @@
 /// There is a method to let web designers take control over the viewport (the user's visible area of a web page), through the `<meta>` tag (See "Setting The Viewport" example below).
 open class Meta: EmptyTag {
     
-    override open class var name: String { .init(Meta.self) }
+    override open class var name: String { .init(describing: Meta.self).lowercased() }
 }
 
 public extension Meta {
diff --git a/Sources/SwiftHtml/Tags/Meter.swift b/Sources/SwiftHtml/Tags/Meter.swift
index da980b9..c0706dc 100644
--- a/Sources/SwiftHtml/Tags/Meter.swift
+++ b/Sources/SwiftHtml/Tags/Meter.swift
@@ -14,7 +14,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Meter: StandardTag {
     
-    override open class var name: String { .init(Meter.self) }
+    override open class var name: String { .init(describing: Meter.self).lowercased() }
     
     public init(value: Int, _ contents: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Nav.swift b/Sources/SwiftHtml/Tags/Nav.swift
index e5a9d80..ee67968 100644
--- a/Sources/SwiftHtml/Tags/Nav.swift
+++ b/Sources/SwiftHtml/Tags/Nav.swift
@@ -12,7 +12,7 @@
 /// Browsers, such as screen readers for disabled users, can use this element to determine whether to omit the initial rendering of this content.
 open class Nav: StandardTag {
     
-    override open class var name: String { .init(Nav.self) }
+    override open class var name: String { .init(describing: Nav.self).lowercased() }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Noscript.swift b/Sources/SwiftHtml/Tags/Noscript.swift
index d4e6996..afba638 100644
--- a/Sources/SwiftHtml/Tags/Noscript.swift
+++ b/Sources/SwiftHtml/Tags/Noscript.swift
@@ -10,5 +10,5 @@
 /// The `<noscript>` element can be used in both `<head>` and `<body>`. When used inside `<head>`, the `<noscript>` element could only contain `<link>`, `<style>`, and `<meta>` elements.
 open class Noscript: StandardTag {
     
-    override open class var name: String { .init(Noscript.self) }
+    override open class var name: String { .init(describing: Noscript.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Object.swift b/Sources/SwiftHtml/Tags/Object.swift
index db4a762..17b5f78 100644
--- a/Sources/SwiftHtml/Tags/Object.swift
+++ b/Sources/SwiftHtml/Tags/Object.swift
@@ -10,7 +10,7 @@
 /// The external resource can be a web page, a picture, a media player, or a plug-in application.
 open class Object: StandardTag {
     
-    override open class var name: String { .init(Object.self) }
+    override open class var name: String { .init(describing: Object.self).lowercased() }
 }
 
 public extension Object {
diff --git a/Sources/SwiftHtml/Tags/Ol.swift b/Sources/SwiftHtml/Tags/Ol.swift
index 192f175..2f6897e 100644
--- a/Sources/SwiftHtml/Tags/Ol.swift
+++ b/Sources/SwiftHtml/Tags/Ol.swift
@@ -14,7 +14,7 @@
 /// **Tip:** For unordered list, use the `<ul>` tag.
 open class Ol: StandardTag {
     
-    override open class var name: String { .init(Ol.self) }
+    override open class var name: String { .init(describing: Ol.self).lowercased() }
 }
 
 public extension Ol {
diff --git a/Sources/SwiftHtml/Tags/Optgroup.swift b/Sources/SwiftHtml/Tags/Optgroup.swift
index 45dfee8..703d91b 100644
--- a/Sources/SwiftHtml/Tags/Optgroup.swift
+++ b/Sources/SwiftHtml/Tags/Optgroup.swift
@@ -10,7 +10,7 @@
 /// If you have a long list of options, groups of related options are easier to handle for a user.
 open class Optgroup: StandardTag {
     
-    override open class var name: String { .init(Optgroup.self) }
+    override open class var name: String { .init(describing: Optgroup.self).lowercased() }
 }
 
 public extension Optgroup {
diff --git a/Sources/SwiftHtml/Tags/Option.swift b/Sources/SwiftHtml/Tags/Option.swift
index 06e7470..892d1f0 100644
--- a/Sources/SwiftHtml/Tags/Option.swift
+++ b/Sources/SwiftHtml/Tags/Option.swift
@@ -14,7 +14,7 @@
 /// **Tip:** If you have a long list of options, you can group related options within the `<optgroup>` tag.
 open class Option: StandardTag {
     
-    override open class var name: String { .init(Option.self) }
+    override open class var name: String { .init(describing: Option.self).lowercased() }
 }
 
 public extension Option {
diff --git a/Sources/SwiftHtml/Tags/Output.swift b/Sources/SwiftHtml/Tags/Output.swift
index 67fcb68..9d45185 100644
--- a/Sources/SwiftHtml/Tags/Output.swift
+++ b/Sources/SwiftHtml/Tags/Output.swift
@@ -8,7 +8,7 @@
 /// The `<output>` tag is used to represent the result of a calculation (like one performed by a script).
 open class Output: StandardTag {
     
-    override open class var name: String { .init(Output.self) }
+    override open class var name: String { .init(describing: Output.self).lowercased() }
 }
 
 public extension Output {
diff --git a/Sources/SwiftHtml/Tags/P.swift b/Sources/SwiftHtml/Tags/P.swift
index 7c3b0be..a7e6021 100644
--- a/Sources/SwiftHtml/Tags/P.swift
+++ b/Sources/SwiftHtml/Tags/P.swift
@@ -12,5 +12,5 @@
 /// **Tip:** Use CSS to style paragraphs.
 open class P: StandardTag {
     
-    override open class var name: String { .init(P.self) }
+    override open class var name: String { .init(describing: P.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index 103728c..80c14ac 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -8,7 +8,7 @@
 /// The `<param>` tag is used to define parameters for an `<object>` element.
 open class Param: EmptyTag {
     
-    override open class var name: String { .init(Param.self) }
+    override open class var name: String { .init(describing: Param.self).lowercased() }
 }
 
 public extension Param {
diff --git a/Sources/SwiftHtml/Tags/Picture.swift b/Sources/SwiftHtml/Tags/Picture.swift
index fe4c6c9..cf0f633 100644
--- a/Sources/SwiftHtml/Tags/Picture.swift
+++ b/Sources/SwiftHtml/Tags/Picture.swift
@@ -18,5 +18,5 @@
 /// **Tip:** The `<picture>` element works "similar" to `<video>` and `<audio>`. You set up different sources, and the first source that fits the preferences is the one being used.
 open class Picture: StandardTag {
     
-    override open class var name: String { .init(Picture.self) }
+    override open class var name: String { .init(describing: Picture.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Pre.swift b/Sources/SwiftHtml/Tags/Pre.swift
index 5c43636..4f3563e 100644
--- a/Sources/SwiftHtml/Tags/Pre.swift
+++ b/Sources/SwiftHtml/Tags/Pre.swift
@@ -11,5 +11,5 @@
 /// The text will be displayed exactly as written in the HTML source code.
 open class Pre: StandardTag {
     
-    override open class var name: String { .init(Pre.self) }
+    override open class var name: String { .init(describing: Pre.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Progress.swift b/Sources/SwiftHtml/Tags/Progress.swift
index 917b461..8f3b5b8 100644
--- a/Sources/SwiftHtml/Tags/Progress.swift
+++ b/Sources/SwiftHtml/Tags/Progress.swift
@@ -10,7 +10,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Progress: StandardTag {
     
-    override open class var name: String { .init(Progress.self) }
+    override open class var name: String { .init(describing: Progress.self).lowercased() }
 }
 
 public extension Progress {
diff --git a/Sources/SwiftHtml/Tags/Q.swift b/Sources/SwiftHtml/Tags/Q.swift
index 8087bdb..34e5f2a 100644
--- a/Sources/SwiftHtml/Tags/Q.swift
+++ b/Sources/SwiftHtml/Tags/Q.swift
@@ -12,7 +12,7 @@
 /// **Tip:** Use `<blockquote>` for long quotations.
 open class Q: StandardTag {
     
-    override open class var name: String { .init(Q.self) }
+    override open class var name: String { .init(describing: Q.self).lowercased() }
 }
 
 public extension Q {
diff --git a/Sources/SwiftHtml/Tags/Rp.swift b/Sources/SwiftHtml/Tags/Rp.swift
index 63d3ad8..e195d1a 100644
--- a/Sources/SwiftHtml/Tags/Rp.swift
+++ b/Sources/SwiftHtml/Tags/Rp.swift
@@ -10,5 +10,5 @@
 /// Use `<rp>` together with `<ruby>` and `<rt>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rp: StandardTag {
     
-    override open class var name: String { .init(Rp.self) }
+    override open class var name: String { .init(describing: Rp.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Rt.swift b/Sources/SwiftHtml/Tags/Rt.swift
index ba5ba65..7763328 100644
--- a/Sources/SwiftHtml/Tags/Rt.swift
+++ b/Sources/SwiftHtml/Tags/Rt.swift
@@ -10,5 +10,5 @@
 /// Use `<rt>` together with `<ruby>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rt: StandardTag {
     
-    override open class var name: String { .init(Rt.self) }
+    override open class var name: String { .init(describing: Rt.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Ruby.swift b/Sources/SwiftHtml/Tags/Ruby.swift
index f3c2ff5..89a7f50 100644
--- a/Sources/SwiftHtml/Tags/Ruby.swift
+++ b/Sources/SwiftHtml/Tags/Ruby.swift
@@ -12,5 +12,5 @@
 /// Use `<ruby>` together with `<rt>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that do not support ruby annotations.
 open class Ruby: StandardTag {
     
-    override open class var name: String { .init(Ruby.self) }
+    override open class var name: String { .init(describing: Ruby.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/S.swift b/Sources/SwiftHtml/Tags/S.swift
index 2a3f234..a41c6b5 100644
--- a/Sources/SwiftHtml/Tags/S.swift
+++ b/Sources/SwiftHtml/Tags/S.swift
@@ -10,5 +10,5 @@
 /// The `<s>` tag should not be used to define deleted text in a document, use the `<del>` tag for that.
 open class S: StandardTag {
     
-    override open class var name: String { .init(S.self) }
+    override open class var name: String { .init(describing: S.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Samp.swift b/Sources/SwiftHtml/Tags/Samp.swift
index c3d4c90..13be63b 100644
--- a/Sources/SwiftHtml/Tags/Samp.swift
+++ b/Sources/SwiftHtml/Tags/Samp.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Samp: StandardTag {
     
-    override open class var name: String { .init(Samp.self) }
+    override open class var name: String { .init(describing: Samp.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Script.swift b/Sources/SwiftHtml/Tags/Script.swift
index 2bd757a..8b026a3 100644
--- a/Sources/SwiftHtml/Tags/Script.swift
+++ b/Sources/SwiftHtml/Tags/Script.swift
@@ -12,7 +12,7 @@
 /// Common uses for JavaScript are image manipulation, form validation, and dynamic changes of content.
 open class Script: StandardTag {
     
-    override open class var name: String { .init(Script.self) }
+    override open class var name: String { .init(describing: Script.self).lowercased() }
     
     public enum `Type`: String {
         case javascript = "text/javascript"
diff --git a/Sources/SwiftHtml/Tags/Section.swift b/Sources/SwiftHtml/Tags/Section.swift
index e63c1e2..c40c4e4 100644
--- a/Sources/SwiftHtml/Tags/Section.swift
+++ b/Sources/SwiftHtml/Tags/Section.swift
@@ -8,5 +8,5 @@
 /// The `<section>` tag defines a section in a document.
 open class Section: StandardTag {
     
-    override open class var name: String { .init(Section.self) }
+    override open class var name: String { .init(describing: Section.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Select.swift b/Sources/SwiftHtml/Tags/Select.swift
index cfedecf..6e1c136 100644
--- a/Sources/SwiftHtml/Tags/Select.swift
+++ b/Sources/SwiftHtml/Tags/Select.swift
@@ -18,7 +18,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Select: StandardTag {
     
-    override open class var name: String { .init(Select.self) }
+    override open class var name: String { .init(describing: Select.self).lowercased() }
 }
 
 public extension Select {
diff --git a/Sources/SwiftHtml/Tags/Small.swift b/Sources/SwiftHtml/Tags/Small.swift
index c0b7a02..f311252 100644
--- a/Sources/SwiftHtml/Tags/Small.swift
+++ b/Sources/SwiftHtml/Tags/Small.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated, but it is possible to achieve richer (or the same) effect with CSS.
 open class Small: StandardTag {
     
-    override open class var name: String { .init(Small.self) }
+    override open class var name: String { .init(describing: Small.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index 1e05cba..d2906d9 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -12,7 +12,7 @@
 /// The browser will choose the first `<source>` it supports.
 open class Source: EmptyTag {
     
-    override open class var name: String { .init(Source.self) }
+    override open class var name: String { .init(describing: Source.self).lowercased() }
 }
 
 public extension Source {
diff --git a/Sources/SwiftHtml/Tags/Span.swift b/Sources/SwiftHtml/Tags/Span.swift
index 70e226e..b4a28cc 100644
--- a/Sources/SwiftHtml/Tags/Span.swift
+++ b/Sources/SwiftHtml/Tags/Span.swift
@@ -12,5 +12,5 @@
 /// The `<span>` tag is much like the `<div>` element, but `<div>` is a block-level element and `<span>` is an inline element.
 open class Span: StandardTag {
     
-    override open class var name: String { .init(Span.self) }
+    override open class var name: String { .init(describing: Span.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Strong.swift b/Sources/SwiftHtml/Tags/Strong.swift
index 0d2a714..e2f7846 100644
--- a/Sources/SwiftHtml/Tags/Strong.swift
+++ b/Sources/SwiftHtml/Tags/Strong.swift
@@ -10,5 +10,5 @@
 /// **Tip:** Use the `<b>` tag to specify bold text without any extra importance!
 open class Strong: StandardTag {
     
-    override open class var name: String { .init(Strong.self) }
+    override open class var name: String { .init(describing: Strong.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Style.swift b/Sources/SwiftHtml/Tags/Style.swift
index 1750db3..18a0065 100644
--- a/Sources/SwiftHtml/Tags/Style.swift
+++ b/Sources/SwiftHtml/Tags/Style.swift
@@ -11,7 +11,7 @@
 /// Inside the `<style>` element you specify how HTML elements should render in a browser.
 open class Style: StandardTag {
     
-    override open class var name: String { .init(Style.self) }
+    override open class var name: String { .init(describing: Style.self).lowercased() }
 }
 
 public extension Style {
diff --git a/Sources/SwiftHtml/Tags/Sub.swift b/Sources/SwiftHtml/Tags/Sub.swift
index 71413e4..40ddfcd 100644
--- a/Sources/SwiftHtml/Tags/Sub.swift
+++ b/Sources/SwiftHtml/Tags/Sub.swift
@@ -13,5 +13,5 @@
 /// **Tip:** Use the `<sup>` tag to define superscripted text.
 open class Sub: StandardTag {
     
-    override open class var name: String { .init(Sub.self) }
+    override open class var name: String { .init(describing: Sub.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Summary.swift b/Sources/SwiftHtml/Tags/Summary.swift
index e1cfca1..041a516 100644
--- a/Sources/SwiftHtml/Tags/Summary.swift
+++ b/Sources/SwiftHtml/Tags/Summary.swift
@@ -10,5 +10,5 @@
 /// **Note:** The `<summary>` element should be the first child element of the `<details>` element.
 open class Summary: StandardTag {
     
-    override open class var name: String { .init(Summary.self) }
+    override open class var name: String { .init(describing: Summary.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Sup.swift b/Sources/SwiftHtml/Tags/Sup.swift
index 91982f8..92d6278 100644
--- a/Sources/SwiftHtml/Tags/Sup.swift
+++ b/Sources/SwiftHtml/Tags/Sup.swift
@@ -13,5 +13,5 @@
 /// **Tip:** Use the `<sub>` tag to define subscript text.
 open class Sup: StandardTag {
     
-    override open class var name: String { .init(Sup.self) }
+    override open class var name: String { .init(describing: Sup.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Table.swift b/Sources/SwiftHtml/Tags/Table.swift
index 4889371..4318863 100644
--- a/Sources/SwiftHtml/Tags/Table.swift
+++ b/Sources/SwiftHtml/Tags/Table.swift
@@ -14,5 +14,5 @@
 /// An HTML table may also include `<caption>`, `<colgroup>`, `<thead>`, `<tfoot>`, and `<tbody>` elements.
 open class Table: StandardTag {
     
-    override open class var name: String { .init(Table.self) }
+    override open class var name: String { .init(describing: Table.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Tbody.swift b/Sources/SwiftHtml/Tags/Tbody.swift
index 1781848..2fe72af 100644
--- a/Sources/SwiftHtml/Tags/Tbody.swift
+++ b/Sources/SwiftHtml/Tags/Tbody.swift
@@ -19,6 +19,6 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tbody: StandardTag {
     
-    override open class var name: String { .init(Tbody.self) }
+    override open class var name: String { .init(describing: Tbody.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Td.swift b/Sources/SwiftHtml/Tags/Td.swift
index fe2f8db..a328ece 100644
--- a/Sources/SwiftHtml/Tags/Td.swift
+++ b/Sources/SwiftHtml/Tags/Td.swift
@@ -17,7 +17,7 @@
 /// The text in `<th>` elements are bold and centered by default.
 open class Td: StandardTag {
     
-    override open class var name: String { .init(Td.self) }
+    override open class var name: String { .init(describing: Td.self).lowercased() }
 }
 
 public extension Td {
diff --git a/Sources/SwiftHtml/Tags/Template.swift b/Sources/SwiftHtml/Tags/Template.swift
index 5ae1298..70e99af 100644
--- a/Sources/SwiftHtml/Tags/Template.swift
+++ b/Sources/SwiftHtml/Tags/Template.swift
@@ -13,7 +13,7 @@
 /// To do this without the `<template>` tag, you have to create the HTML code with JavaScript to prevent the browser from rendering the code.
 open class Template: StandardTag {
     
-    override open class var name: String { .init(Template.self) }
+    override open class var name: String { .init(describing: Template.self).lowercased() }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Textarea.swift b/Sources/SwiftHtml/Tags/Textarea.swift
index 9731543..ba442f9 100644
--- a/Sources/SwiftHtml/Tags/Textarea.swift
+++ b/Sources/SwiftHtml/Tags/Textarea.swift
@@ -20,7 +20,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Textarea: StandardTag {
     
-    override open class var name: String { .init(Textarea.self) }
+    override open class var name: String { .init(describing: Textarea.self).lowercased() }
 }
 
 public extension Textarea {
diff --git a/Sources/SwiftHtml/Tags/Tfoot.swift b/Sources/SwiftHtml/Tags/Tfoot.swift
index d28844c..7911f8c 100644
--- a/Sources/SwiftHtml/Tags/Tfoot.swift
+++ b/Sources/SwiftHtml/Tags/Tfoot.swift
@@ -19,5 +19,5 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tfoot: StandardTag {
     
-    override open class var name: String { .init(Tfoot.self) }
+    override open class var name: String { .init(describing: Tfoot.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Th.swift b/Sources/SwiftHtml/Tags/Th.swift
index 4ca0a75..6cf68ea 100644
--- a/Sources/SwiftHtml/Tags/Th.swift
+++ b/Sources/SwiftHtml/Tags/Th.swift
@@ -17,7 +17,7 @@
 /// The text in `<td>` elements are regular and left-aligned by default.
 open class Th: StandardTag {
     
-    override open class var name: String { .init(Th.self) }
+    override open class var name: String { .init(describing: Th.self).lowercased() }
 }
 
 public extension Th {
diff --git a/Sources/SwiftHtml/Tags/Thead.swift b/Sources/SwiftHtml/Tags/Thead.swift
index 814838c..058f03e 100644
--- a/Sources/SwiftHtml/Tags/Thead.swift
+++ b/Sources/SwiftHtml/Tags/Thead.swift
@@ -19,5 +19,5 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Thead: StandardTag {
     
-    override open class var name: String { .init(Thead.self) }
+    override open class var name: String { .init(describing: Thead.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Time.swift b/Sources/SwiftHtml/Tags/Time.swift
index b101f86..95dcb3d 100644
--- a/Sources/SwiftHtml/Tags/Time.swift
+++ b/Sources/SwiftHtml/Tags/Time.swift
@@ -10,7 +10,7 @@
 /// The datetime attribute of this element is used translate the time into a machine-readable format so that browsers can offer to add date reminders through the user's calendar, and search engines can produce smarter search results.
 open class Time: StandardTag {
     
-    override open class var name: String { .init(Time.self) }
+    override open class var name: String { .init(describing: Time.self).lowercased() }
 }
 
 public extension Time {
diff --git a/Sources/SwiftHtml/Tags/Title.swift b/Sources/SwiftHtml/Tags/Title.swift
index bcb245b..2d129fe 100644
--- a/Sources/SwiftHtml/Tags/Title.swift
+++ b/Sources/SwiftHtml/Tags/Title.swift
@@ -28,5 +28,5 @@
 /// **Note:** You can NOT have more than one `<title>` element in an HTML document.
 open class Title: StandardTag {
     
-    override open class var name: String { .init(Title.self) }
+    override open class var name: String { .init(describing: Title.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Tr.swift b/Sources/SwiftHtml/Tags/Tr.swift
index bda4d9a..21603a3 100644
--- a/Sources/SwiftHtml/Tags/Tr.swift
+++ b/Sources/SwiftHtml/Tags/Tr.swift
@@ -10,5 +10,5 @@
 /// A `<tr>` element contains one or more `<th>` or `<td>` elements.
 open class Tr: StandardTag {
     
-    override open class var name: String { .init(Tr.self) }
+    override open class var name: String { .init(describing: Tr.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index 782b5b8..b288cee 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -12,7 +12,7 @@
 /// Tracks are formatted in WebVTT format (.vtt files).
 open class Track: EmptyTag {
     
-    override open class var name: String { .init(Track.self) }
+    override open class var name: String { .init(describing: Track.self).lowercased() }
     
     public init(src: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/U.swift b/Sources/SwiftHtml/Tags/U.swift
index ed4138e..aba93f5 100644
--- a/Sources/SwiftHtml/Tags/U.swift
+++ b/Sources/SwiftHtml/Tags/U.swift
@@ -13,5 +13,5 @@
 /// **Tip:** Avoid using the `<u>` element where it could be confused for a hyperlink!
 open class U: StandardTag {
     
-    override open class var name: String { .init(U.self) }
+    override open class var name: String { .init(describing: U.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Ul.swift b/Sources/SwiftHtml/Tags/Ul.swift
index b0d0e44..7ff907a 100644
--- a/Sources/SwiftHtml/Tags/Ul.swift
+++ b/Sources/SwiftHtml/Tags/Ul.swift
@@ -14,5 +14,5 @@
 /// **Tip:** For ordered lists, use the `<ol>` tag.
 open class Ul: StandardTag {
     
-    override open class var name: String { .init(Ul.self) }
+    override open class var name: String { .init(describing: Ul.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Var.swift b/Sources/SwiftHtml/Tags/Var.swift
index 321a5fc..700a36e 100644
--- a/Sources/SwiftHtml/Tags/Var.swift
+++ b/Sources/SwiftHtml/Tags/Var.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Var: StandardTag {
     
-    override open class var name: String { .init(Var.self) }
+    override open class var name: String { .init(describing: Var.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Video.swift b/Sources/SwiftHtml/Tags/Video.swift
index fdcd73c..d85e5ed 100644
--- a/Sources/SwiftHtml/Tags/Video.swift
+++ b/Sources/SwiftHtml/Tags/Video.swift
@@ -22,7 +22,7 @@
 ///     Opera   | YES | YES  | YES
 open class Video: StandardTag {
     
-    override open class var name: String { .init(Video.self) }
+    override open class var name: String { .init(describing: Video.self).lowercased() }
 }
 
 public extension Video {
diff --git a/Sources/SwiftHtml/Tags/Wbr.swift b/Sources/SwiftHtml/Tags/Wbr.swift
index 49a67b9..8bcd498 100644
--- a/Sources/SwiftHtml/Tags/Wbr.swift
+++ b/Sources/SwiftHtml/Tags/Wbr.swift
@@ -10,5 +10,5 @@
 /// **Tip:** When a word is too long, the browser might break it at the wrong place. You can use the `<wbr>` element to add word break opportunities.
 open class Wbr: StandardTag {
     
-    override open class var name: String { .init(Wbr.self) }
+    override open class var name: String { .init(describing: Wbr.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Channel.swift b/Sources/SwiftRss/Channel.swift
index 3ef59b7..f6723d3 100644
--- a/Sources/SwiftRss/Channel.swift
+++ b/Sources/SwiftRss/Channel.swift
@@ -7,5 +7,5 @@
 
 public class Channel: StandardTag {
     
-    override open class var name: String { .init(Channel.self) }
+    override open class var name: String { .init(describing: Channel.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Description.swift b/Sources/SwiftRss/Description.swift
index c92abb0..9db38ca 100644
--- a/Sources/SwiftRss/Description.swift
+++ b/Sources/SwiftRss/Description.swift
@@ -7,7 +7,7 @@
 
 open class Description: StandardTag {
     
-    override open class var name: String { .init(Description.self) }
+    override open class var name: String { .init(describing: Description.self).lowercased() }
     
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftRss/Guid.swift b/Sources/SwiftRss/Guid.swift
index f081dce..85ebdb7 100644
--- a/Sources/SwiftRss/Guid.swift
+++ b/Sources/SwiftRss/Guid.swift
@@ -7,7 +7,7 @@
 
 open class Guid: StandardTag {
     
-    override open class var name: String { .init(Guid.self) }
+    override open class var name: String { .init(describing: Guid.self).lowercased() }
 
 }
 
diff --git a/Sources/SwiftRss/Item.swift b/Sources/SwiftRss/Item.swift
index f645792..d43c7a9 100644
--- a/Sources/SwiftRss/Item.swift
+++ b/Sources/SwiftRss/Item.swift
@@ -8,5 +8,5 @@
 
 public class Item: StandardTag {
     
-    override open class var name: String { .init(Item.self) }
+    override open class var name: String { .init(describing: Item.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Language.swift b/Sources/SwiftRss/Language.swift
index f568d83..22c231c 100644
--- a/Sources/SwiftRss/Language.swift
+++ b/Sources/SwiftRss/Language.swift
@@ -7,5 +7,5 @@
 
 open class Language: StandardTag {
 
-    override open class var name: String { .init(Language.self) }
+    override open class var name: String { .init(describing: Language.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Link.swift b/Sources/SwiftRss/Link.swift
index d5df1e0..3b0d750 100644
--- a/Sources/SwiftRss/Link.swift
+++ b/Sources/SwiftRss/Link.swift
@@ -7,5 +7,5 @@
 
 open class Link: StandardTag {
 
-    override open class var name: String { .init(Link.self) }
+    override open class var name: String { .init(describing: Link.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Rss.swift b/Sources/SwiftRss/Rss.swift
index 67770da..baa9264 100644
--- a/Sources/SwiftRss/Rss.swift
+++ b/Sources/SwiftRss/Rss.swift
@@ -8,7 +8,7 @@
 // https://validator.w3.org/feed/docs/rss2.html#ltttlgtSubelementOfLtchannelgt
 open class Rss: StandardTag {
     
-    override open class var name: String { .init(Rss.self) }
+    override open class var name: String { .init(describing: Rss.self).lowercased() }
     
     public init(@TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
diff --git a/Sources/SwiftRss/Title.swift b/Sources/SwiftRss/Title.swift
index 751f01a..f526f63 100644
--- a/Sources/SwiftRss/Title.swift
+++ b/Sources/SwiftRss/Title.swift
@@ -7,7 +7,7 @@
 
 open class Title: StandardTag {
     
-    override open class var name: String { .init(Title.self) }
+    override open class var name: String { .init(describing: Title.self).lowercased() }
 
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftRss/Ttl.swift b/Sources/SwiftRss/Ttl.swift
index 3a39a81..fb7e86f 100644
--- a/Sources/SwiftRss/Ttl.swift
+++ b/Sources/SwiftRss/Ttl.swift
@@ -7,7 +7,7 @@
 
 open class Ttl: StandardTag {
     
-    override open class var name: String { .init(Ttl.self) }
+    override open class var name: String { .init(describing: Ttl.self).lowercased() }
 
     public init(_ value: Int) {
         super.init()
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 6edafe2..1a3b48b 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -22,7 +22,7 @@ open class Tag {
     public private(set) var children: [Tag]?
     
     open class var kind: Kind? { nil }
-    open class var name: String { .init(self).lowercased() }
+    open class var name: String { .init(describing: self).lowercased() }
     
     // MARK: - init
     public init(kind: Kind? = nil,
@@ -139,11 +139,3 @@ open class Tag {
         return self
     }
 }
-
-public extension String {
-    
-    /// convert class names into node names
-    init(_ `class`: AnyClass) {
-        self.init(stringLiteral: .init(describing: `class`.self).lowercased())
-    }
-}
diff --git a/Sources/SwiftSitemap/ChangeFreq.swift b/Sources/SwiftSitemap/ChangeFreq.swift
index 3d26129..ab2a529 100644
--- a/Sources/SwiftSitemap/ChangeFreq.swift
+++ b/Sources/SwiftSitemap/ChangeFreq.swift
@@ -7,7 +7,7 @@
 
 open class ChangeFreq: StandardTag {
     
-    override open class var name: String { .init(ChangeFreq.self) }
+    override open class var name: String { .init(describing: ChangeFreq.self).lowercased() }
     
     public enum Value: String {
         case always
diff --git a/Sources/SwiftSitemap/LastMod.swift b/Sources/SwiftSitemap/LastMod.swift
index cc553ee..172c623 100644
--- a/Sources/SwiftSitemap/LastMod.swift
+++ b/Sources/SwiftSitemap/LastMod.swift
@@ -7,5 +7,5 @@
 
 open class LastMod: StandardTag {
 
-    override open class var name: String { .init(LastMod.self) }
+    override open class var name: String { .init(describing: LastMod.self).lowercased() }
 }
diff --git a/Sources/SwiftSitemap/Loc.swift b/Sources/SwiftSitemap/Loc.swift
index 29757fa..b917fb6 100644
--- a/Sources/SwiftSitemap/Loc.swift
+++ b/Sources/SwiftSitemap/Loc.swift
@@ -7,5 +7,5 @@
 
 open class Loc: StandardTag {
     
-    override open class var name: String { .init(Loc.self) }
+    override open class var name: String { .init(describing: Loc.self).lowercased() }
 }
diff --git a/Sources/SwiftSitemap/Priority.swift b/Sources/SwiftSitemap/Priority.swift
index c84f8a3..1282b94 100644
--- a/Sources/SwiftSitemap/Priority.swift
+++ b/Sources/SwiftSitemap/Priority.swift
@@ -7,7 +7,7 @@
 
 open class Priority: StandardTag {
     
-    override open class var name: String { .init(Priority.self) }
+    override open class var name: String { .init(describing: Priority.self).lowercased() }
 
     public init(_ value: Double) {
         super.init()
diff --git a/Sources/SwiftSitemap/Sitemap.swift b/Sources/SwiftSitemap/Sitemap.swift
index f491d4d..24cc92e 100644
--- a/Sources/SwiftSitemap/Sitemap.swift
+++ b/Sources/SwiftSitemap/Sitemap.swift
@@ -8,5 +8,5 @@
 // https://www.sitemaps.org/protocol.html
 open class Sitemap: StandardTag {
     
-    override open class var name: String { .init(Sitemap.self) }
+    override open class var name: String { .init(describing: Sitemap.self).lowercased() }
 }
diff --git a/Sources/SwiftSitemap/SitemapIndex.swift b/Sources/SwiftSitemap/SitemapIndex.swift
index 78ad84e..8a8902b 100644
--- a/Sources/SwiftSitemap/SitemapIndex.swift
+++ b/Sources/SwiftSitemap/SitemapIndex.swift
@@ -7,7 +7,7 @@
 
 open class SitemapIndex: StandardTag {
     
-    override open class var name: String { .init(SitemapIndex.self) }
+    override open class var name: String { .init(describing: SitemapIndex.self).lowercased() }
 
     public init(@TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
diff --git a/Sources/SwiftSitemap/Url.swift b/Sources/SwiftSitemap/Url.swift
index 0c2d963..18e069f 100644
--- a/Sources/SwiftSitemap/Url.swift
+++ b/Sources/SwiftSitemap/Url.swift
@@ -7,5 +7,5 @@
 
 open class Url: StandardTag {
     
-    override open class var name: String { .init(Url.self) }
+    override open class var name: String { .init(describing: Url.self).lowercased() }
 }
diff --git a/Sources/SwiftSitemap/UrlSet.swift b/Sources/SwiftSitemap/UrlSet.swift
index c9a7c2d..4c624e9 100644
--- a/Sources/SwiftSitemap/UrlSet.swift
+++ b/Sources/SwiftSitemap/UrlSet.swift
@@ -7,7 +7,7 @@
 
 open class UrlSet: StandardTag {
     
-    override open class var name: String { .init(UrlSet.self) }
+    override open class var name: String { .init(describing: UrlSet.self).lowercased() }
 
     public init(@TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
diff --git a/Sources/SwiftSvg/Circle.swift b/Sources/SwiftSvg/Circle.swift
index cfb3135..8f65c14 100644
--- a/Sources/SwiftSvg/Circle.swift
+++ b/Sources/SwiftSvg/Circle.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/circle
 open class Circle: StandardTag {
     
-    override open class var name: String { .init(Circle.self) }
+    override open class var name: String { .init(describing: Circle.self).lowercased() }
 
     public init(cx: Double,
                 cy: Double,
diff --git a/Sources/SwiftSvg/Ellipse.swift b/Sources/SwiftSvg/Ellipse.swift
index a785269..1e871c7 100644
--- a/Sources/SwiftSvg/Ellipse.swift
+++ b/Sources/SwiftSvg/Ellipse.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/ellipse
 open class Ellipse: EmptyTag {
     
-    override open class var name: String { .init(Ellipse.self) }
+    override open class var name: String { .init(describing: Ellipse.self).lowercased() }
 
     public init(cx: Double,
                 cy: Double,
diff --git a/Sources/SwiftSvg/Line.swift b/Sources/SwiftSvg/Line.swift
index 09ab205..638c51e 100644
--- a/Sources/SwiftSvg/Line.swift
+++ b/Sources/SwiftSvg/Line.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/line
 open class Line: StandardTag {
     
-    override open class var name: String { .init(Line.self) }
+    override open class var name: String { .init(describing: Line.self).lowercased() }
 
     public init(x1: Double,
                 y1: Double,
diff --git a/Sources/SwiftSvg/Path.swift b/Sources/SwiftSvg/Path.swift
index 6317cc6..46490a5 100644
--- a/Sources/SwiftSvg/Path.swift
+++ b/Sources/SwiftSvg/Path.swift
@@ -9,7 +9,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/path
 open class Path: StandardTag {
     
-    override open class var name: String { .init(Path.self) }
+    override open class var name: String { .init(describing: Path.self).lowercased() }
 
     public init(_ d: String, pathLength: Double? = nil) {
         super.init()
diff --git a/Sources/SwiftSvg/Polygon.swift b/Sources/SwiftSvg/Polygon.swift
index f8307af..adff16a 100644
--- a/Sources/SwiftSvg/Polygon.swift
+++ b/Sources/SwiftSvg/Polygon.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/polygon
 open class Polygon: StandardTag {
     
-    override open class var name: String { .init(Polygon.self) }
+    override open class var name: String { .init(describing: Polygon.self).lowercased() }
 
     public init(_ points: [Double], pathLength: Double? = nil) {
         super.init()
diff --git a/Sources/SwiftSvg/Polyline.swift b/Sources/SwiftSvg/Polyline.swift
index bf989ce..e1b019a 100644
--- a/Sources/SwiftSvg/Polyline.swift
+++ b/Sources/SwiftSvg/Polyline.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/polyline
 open class Polyline: StandardTag {
     
-    override open class var name: String { .init(Polyline.self) }
+    override open class var name: String { .init(describing: Polyline.self).lowercased() }
 
     public init(_ points: [Double], pathLength: Double? = nil) {
         super.init()
diff --git a/Sources/SwiftSvg/Rect.swift b/Sources/SwiftSvg/Rect.swift
index 90c4918..cc05469 100644
--- a/Sources/SwiftSvg/Rect.swift
+++ b/Sources/SwiftSvg/Rect.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/rect
 open class Rect: EmptyTag {
     
-    override open class var name: String { .init(Rect.self) }
+    override open class var name: String { .init(describing: Rect.self).lowercased() }
 
     public init(x: Double,
                 y: Double,
diff --git a/Sources/SwiftSvg/Svg.swift b/Sources/SwiftSvg/Svg.swift
index 8ea0271..7f3c6b3 100644
--- a/Sources/SwiftSvg/Svg.swift
+++ b/Sources/SwiftSvg/Svg.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element
 open class Svg: StandardTag {
     
-    override open class var name: String { .init(Svg.self) }
+    override open class var name: String { .init(describing: Svg.self).lowercased() }
 }
 
 public extension Svg {
diff --git a/Tests/SwiftHtmlTests/TagCompositionTests.swift b/Tests/SwiftHtmlTests/TagCompositionTests.swift
index b17b3bf..cca5989 100644
--- a/Tests/SwiftHtmlTests/TagCompositionTests.swift
+++ b/Tests/SwiftHtmlTests/TagCompositionTests.swift
@@ -105,7 +105,7 @@ final class TagCompositionTests: XCTestCase {
         let doc = Document {
             H1("foo")
             for value in ["1", "2", "3"] {
-                GroupTag {
+                Tag {
                     H2(value)
                     ListComponent(["a", "b", "c"])
                 }

From f3e24a5ff551e8255f2c83868a0eb496f592c197 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 15:14:04 -0400
Subject: [PATCH 095/141] Make properties optional

---
 Sources/SwiftHtml/Tags/Head.swift | 40 +++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index 516482f..ecba7f1 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -25,18 +25,18 @@ open class Head: StandardTag {
     override open class var name: String { .init(Head.self) }
     
     public private(set) var title: Title?
-    public private(set) var styles: [Style]
-    public private(set) var links: [Link]
-    public private(set) var metas: [Meta]
-    public private(set) var scripts: [Script]
-    public private(set) var bases: [Base]
+    public private(set) var styles: [Style]?
+    public private(set) var links: [Link]?
+    public private(set) var metas: [Meta]?
+    public private(set) var scripts: [Script]?
+    public private(set) var bases: [Base]?
     
     public init(title: Title? = nil,
-                styles: [Style] = [],
-                links: [Link] = [],
-                metas: [Meta] = [],
-                scripts: [Script] = [],
-                bases: [Base] = [],
+                styles: [Style]? = nil,
+                links: [Link]? = nil,
+                metas: [Meta]? = nil,
+                scripts: [Script]? = nil,
+                bases: [Base]? = nil,
                 _ children: [Tag]? = nil) {
         self.title = title
         self.styles = styles
@@ -46,22 +46,22 @@ open class Head: StandardTag {
         self.bases = bases
         let temp = Tag {
             title != nil ? [title!] : []
-            styles
-            links
-            metas
-            scripts
-            bases
+            styles ?? []
+            links ?? []
+            metas ?? []
+            scripts ?? []
+            bases ?? []
             children ?? []
         }
         super.init(name: Self.name, temp.children)
     }
     
     public convenience init(title: Title? = nil,
-                            styles: [Style] = [],
-                            links: [Link] = [],
-                            metas: [Meta] = [],
-                            scripts: [Script] = [],
-                            bases: [Base] = [],
+                            styles: [Style]? = nil,
+                            links: [Link]? = nil,
+                            metas: [Meta]? = nil,
+                            scripts: [Script]? = nil,
+                            bases: [Base]? = nil,
                             @TagBuilder _ builder: () -> Tag) {
         self.init(title: title,
                   styles: styles,

From ee5cc660f75a640b444e9b8c9a9633864db76863 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 15:38:59 -0400
Subject: [PATCH 096/141] Make scripts property optional

---
 Sources/SwiftHtml/Tags/Body.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 0404d7d..600584e 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -14,14 +14,14 @@ open class Body: StandardTag {
     
     override open class var name: String { .init(Body.self) }
     
-    public private(set) var scripts: [Script]
+    public private(set) var scripts: [Script]?
     
-    public init(scripts: [Script] = [],
+    public init(scripts: [Script]? = nil,
                 _ children: [Tag]? = nil) {
-        self.scripts = scripts
+        self.scripts = scripts ?? []
         let temp = Tag {
             if let children = children { children }
-            Tag { scripts }
+            if let scripts = scripts { scripts }
         }
         super.init(temp.children)
     }

From e9bf09b7bbc41a9151e6e03ad2b3b14f9eaac2b0 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 16:20:53 -0400
Subject: [PATCH 097/141] Add event functions

---
 Sources/SwiftHtml/Attributes/Events.swift | 282 +++++++++++-----------
 Sources/SwiftHtml/Tags/Body.swift         |  49 ++++
 2 files changed, 190 insertions(+), 141 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 73c349e..8c72eb2 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -10,373 +10,373 @@ public extension Tag {
     // MARK: - Window Event Attributes
     
     /// Script to be run after the document is printed
-    func onAfterPrint(_ value: String) -> Self {
-        attribute("onafterprint", value, true)
+    func onAfterPrint(_ value: String?) -> Self {
+        attribute("onafterprint", value)
     }
     
     /// Script to be run before the document is printed
-    func onBeforePrint(_ value: String) -> Self {
-        attribute("onbeforeprint", value, true)
+    func onBeforePrint(_ value: String?) -> Self {
+        attribute("onbeforeprint", value)
     }
     
     /// Script to be run when the document is about to be unloaded
-    func onBeforeUnload(_ value: String) -> Self {
-        attribute("onbeforeunload", value, true)
+    func onBeforeUnload(_ value: String?) -> Self {
+        attribute("onbeforeunload", value)
     }
     
     /// Script to be run when an error occurs
-    func onError(_ value: String) -> Self {
-        attribute("onerror", value, true)
+    func onError(_ value: String?) -> Self {
+        attribute("onerror", value)
     }
     
     /// Script to be run when there has been changes to the anchor part of the a URL
-    func onHashChange(_ value: String) -> Self {
-        attribute("onhashchange", value, true)
+    func onHashChange(_ value: String?) -> Self {
+        attribute("onhashchange", value)
     }
     
     /// Fires after the page is finished loading
-    func onLoad(_ value: String) -> Self {
-        attribute("onload", value, true)
+    func onLoad(_ value: String?) -> Self {
+        attribute("onload", value)
     }
     
     /// Script to be run when the message is triggered
-    func onMessage(_ value: String) -> Self {
-        attribute("onmessage", value, true)
+    func onMessage(_ value: String?) -> Self {
+        attribute("onmessage", value)
     }
     
     /// Script to be run when the browser starts to work offline
-    func onOffline(_ value: String) -> Self {
-        attribute("onoffline", value, true)
+    func onOffline(_ value: String?) -> Self {
+        attribute("onoffline", value)
     }
     
     /// Script to be run when the browser starts to work online
-    func onOnline(_ value: String) -> Self {
-        attribute("ononline", value, true)
+    func onOnline(_ value: String?) -> Self {
+        attribute("ononline", value)
     }
     
     /// Script to be run when a user navigates away from a page
-    func onPageHide(_ value: String) -> Self {
-        attribute("onpagehide", value, true)
+    func onPageHide(_ value: String?) -> Self {
+        attribute("onpagehide", value)
     }
     
     /// Script to be run when a user navigates to a page
-    func onPageShow(_ value: String) -> Self {
-        attribute("onpageshow", value, true)
+    func onPageShow(_ value: String?) -> Self {
+        attribute("onpageshow", value)
     }
     
     /// Script to be run when the window's history changes
-    func onPopState(_ value: String) -> Self {
-        attribute("onpopstate", value, true)
+    func onPopState(_ value: String?) -> Self {
+        attribute("onpopstate", value)
     }
     
     /// Fires when the browser window is resized
-    func onResize(_ value: String) -> Self {
-        attribute("onresize", value, true)
+    func onResize(_ value: String?) -> Self {
+        attribute("onresize", value)
     }
     
     /// Script to be run when a Web Storage area is updated
-    func onStorage(_ value: String) -> Self {
-        attribute("onstorage", value, true)
+    func onStorage(_ value: String?) -> Self {
+        attribute("onstorage", value)
     }
     
     /// Fires once a page has unloaded (or the browser window has been closed)
-    func onUnload(_ value: String) -> Self {
-        attribute("onunload", value, true)
+    func onUnload(_ value: String?) -> Self {
+        attribute("onunload", value)
     }
     
     // MARK: - Form Events
     
     /// Fires the moment that the element loses focus
-    func onBlur(_ value: String) -> Self {
-        attribute("onblur", value, true)
+    func onBlur(_ value: String?) -> Self {
+        attribute("onblur", value)
     }
 
     /// Fires the moment when the value of the element is changed
-    func onChange(_ value: String) -> Self {
-        attribute("onchange", value, true)
+    func onChange(_ value: String?) -> Self {
+        attribute("onchange", value)
     }
 
     /// Script to be run when a context menu is triggered
-    func onContextMenu(_ value: String) -> Self {
-        attribute("oncontextmenu", value, true)
+    func onContextMenu(_ value: String?) -> Self {
+        attribute("oncontextmenu", value)
     }
 
     /// Fires the moment when the element gets focus
-    func onFocus(_ value: String) -> Self {
-        attribute("onfocus", value, true)
+    func onFocus(_ value: String?) -> Self {
+        attribute("onfocus", value)
     }
 
     /// Script to be run when an element gets user input
-    func onInput(_ value: String) -> Self {
-        attribute("oninput", value, true)
+    func onInput(_ value: String?) -> Self {
+        attribute("oninput", value)
     }
 
     /// Script to be run when an element is invalid
-    func onInvalid(_ value: String) -> Self {
-        attribute("oninvalid", value, true)
+    func onInvalid(_ value: String?) -> Self {
+        attribute("oninvalid", value)
     }
 
     /// Fires when the Reset button in a form is clicked
-    func onReset(_ value: String) -> Self {
-        attribute("onreset", value, true)
+    func onReset(_ value: String?) -> Self {
+        attribute("onreset", value)
     }
 
     /// Fires when the user writes something in a search field (for <input="search">)
-    func onSearch(_ value: String) -> Self {
-        attribute("onsearch", value, true)
+    func onSearch(_ value: String?) -> Self {
+        attribute("onsearch", value)
     }
 
     /// Fires after some text has been selected in an element
-    func onSelect(_ value: String) -> Self {
-        attribute("onselect", value, true)
+    func onSelect(_ value: String?) -> Self {
+        attribute("onselect", value)
     }
 
     /// Fires when a form is submitted
-    func onSubmit(_ value: String) -> Self {
-        attribute("onsubmit", value, true)
+    func onSubmit(_ value: String?) -> Self {
+        attribute("onsubmit", value)
     }
     
     // MARK: - Keyboard Events
     
 
     /// Fires when a user is pressing a key
-    func onKeyDown(_ value: String) -> Self {
-        attribute("onkeydown", value, true)
+    func onKeyDown(_ value: String?) -> Self {
+        attribute("onkeydown", value)
     }
 
     /// Fires when a user presses a key
-    func onKeyPress(_ value: String) -> Self {
-        attribute("onkeypress", value, true)
+    func onKeyPress(_ value: String?) -> Self {
+        attribute("onkeypress", value)
     }
 
     /// Fires when a user releases a key
-    func onKeyUp(_ value: String) -> Self {
-        attribute("onkeyup", value, true)
+    func onKeyUp(_ value: String?) -> Self {
+        attribute("onkeyup", value)
     }
     
     // MARK: - Mouse Events
     
 
     /// Fires on a mouse click on the element
-    func onClick(_ value: String) -> Self {
-        attribute("onclick", value, true)
+    func onClick(_ value: String?) -> Self {
+        attribute("onclick", value)
     }
 
     /// Fires on a mouse double-click on the element
-    func onDoubleClick(_ value: String) -> Self {
-        attribute("ondblclick", value, true)
+    func onDoubleClick(_ value: String?) -> Self {
+        attribute("ondblclick", value)
     }
 
     /// Fires when a mouse button is pressed down on an element
-    func onMouseDown(_ value: String) -> Self {
-        attribute("onmousedown", value, true)
+    func onMouseDown(_ value: String?) -> Self {
+        attribute("onmousedown", value)
     }
 
     /// Fires when the mouse pointer is moving while it is over an element
-    func onMouseMove(_ value: String) -> Self {
-        attribute("onmousemove", value, true)
+    func onMouseMove(_ value: String?) -> Self {
+        attribute("onmousemove", value)
     }
 
     /// Fires when the mouse pointer moves out of an element
-    func onMouseOut(_ value: String) -> Self {
-        attribute("onmouseout", value, true)
+    func onMouseOut(_ value: String?) -> Self {
+        attribute("onmouseout", value)
     }
 
     /// Fires when the mouse pointer moves over an element
-    func onMouseOver(_ value: String) -> Self {
-        attribute("onmouseover", value, true)
+    func onMouseOver(_ value: String?) -> Self {
+        attribute("onmouseover", value)
     }
 
     /// Fires when a mouse button is released over an element
-    func onMouseUp(_ value: String) -> Self {
-        attribute("onmouseup", value, true)
+    func onMouseUp(_ value: String?) -> Self {
+        attribute("onmouseup", value)
     }
 
     /// Fires when the mouse wheel rolls up or down over an element
-    func onWheel(_ value: String) -> Self {
-        attribute("onwheel", value, true)
+    func onWheel(_ value: String?) -> Self {
+        attribute("onwheel", value)
     }
     
     // MARK: - Drag Events
 
     /// Script to be run when an element is dragged
-    func onDrag(_ value: String) -> Self {
-        attribute("ondrag", value, true)
+    func onDrag(_ value: String?) -> Self {
+        attribute("ondrag", value)
     }
 
     /// Script to be run at the end of a drag operation
-    func onDragEnd(_ value: String) -> Self {
-        attribute("ondragend", value, true)
+    func onDragEnd(_ value: String?) -> Self {
+        attribute("ondragend", value)
     }
 
     /// Script to be run when an element has been dragged to a valid drop target
-    func onDragEnter(_ value: String) -> Self {
-        attribute("ondragenter", value, true)
+    func onDragEnter(_ value: String?) -> Self {
+        attribute("ondragenter", value)
     }
 
     /// Script to be run when an element leaves a valid drop target
-    func onDragLeave(_ value: String) -> Self {
-        attribute("ondragleave", value, true)
+    func onDragLeave(_ value: String?) -> Self {
+        attribute("ondragleave", value)
     }
 
     /// Script to be run when an element is being dragged over a valid drop target
-    func onDragOver(_ value: String) -> Self {
-        attribute("ondragover", value, true)
+    func onDragOver(_ value: String?) -> Self {
+        attribute("ondragover", value)
     }
 
     /// Script to be run at the start of a drag operation
-    func onDragStart(_ value: String) -> Self {
-        attribute("ondragstart", value, true)
+    func onDragStart(_ value: String?) -> Self {
+        attribute("ondragstart", value)
     }
 
     /// Script to be run when dragged element is being dropped
-    func onDrop(_ value: String) -> Self {
-        attribute("ondrop", value, true)
+    func onDrop(_ value: String?) -> Self {
+        attribute("ondrop", value)
     }
 
     /// Script to be run when an element's scrollbar is being scrolled
-    func onScroll(_ value: String) -> Self {
-        attribute("onscroll", value, true)
+    func onScroll(_ value: String?) -> Self {
+        attribute("onscroll", value)
     }
     
     // MARK: - Clipboard Events
 
     /// Fires when the user copies the content of an element
-    func onCopy(_ value: String) -> Self {
-        attribute("oncopy", value, true)
+    func onCopy(_ value: String?) -> Self {
+        attribute("oncopy", value)
     }
 
     /// Fires when the user cuts the content of an element
-    func onCut(_ value: String) -> Self {
-        attribute("oncut", value, true)
+    func onCut(_ value: String?) -> Self {
+        attribute("oncut", value)
     }
 
     /// Fires when the user pastes some content in an element
-    func onPaste(_ value: String) -> Self {
-        attribute("onpaste", value, true)
+    func onPaste(_ value: String?) -> Self {
+        attribute("onpaste", value)
     }
     
     // MARK: - Media Events
     
     /// Script to be run on abort
-    func onAbort(_ value: String) -> Self {
-        attribute("onabort", value, true)
+    func onAbort(_ value: String?) -> Self {
+        attribute("onabort", value)
     }
 
     /// Script to be run when a file is ready to start playing (when it has buffered enough to begin)
-    func onCanPlay(_ value: String) -> Self {
-        attribute("oncanplay", value, true)
+    func onCanPlay(_ value: String?) -> Self {
+        attribute("oncanplay", value)
     }
 
     /// Script to be run when a file can be played all the way to the end without pausing for buffering
-    func onCanPlaythrough(_ value: String) -> Self {
-        attribute("oncanplaythrough", value, true)
+    func onCanPlaythrough(_ value: String?) -> Self {
+        attribute("oncanplaythrough", value)
     }
 
     /// Script to be run when the cue changes in a <track> element
-    func onCueChange(_ value: String) -> Self {
-        attribute("oncuechange", value, true)
+    func onCueChange(_ value: String?) -> Self {
+        attribute("oncuechange", value)
     }
 
     /// Script to be run when the length of the media changes
-    func onDurationChange(_ value: String) -> Self {
-        attribute("ondurationchange", value, true)
+    func onDurationChange(_ value: String?) -> Self {
+        attribute("ondurationchange", value)
     }
 
     /// Script to be run when something bad happens and the file is suddenly unavailable (like unexpectedly disconnects)
-    func onEmptied(_ value: String) -> Self {
-        attribute("onemptied", value, true)
+    func onEmptied(_ value: String?) -> Self {
+        attribute("onemptied", value)
     }
 
     /// Script to be run when the media has reach the end (a useful event for messages like "thanks for listening")
-    func onEnded(_ value: String) -> Self {
-        attribute("onended", value, true)
+    func onEnded(_ value: String?) -> Self {
+        attribute("onended", value)
     }
 
     /// Script to be run when an error occurs when the file is being loaded
-//    func onError(_ value: String) -> Self {
+//    func onError(_ value: String?) -> Self {
 //        attribute("onerror", value)
 //    }
 
     /// Script to be run when media data is loaded
-    func onLoadedData(_ value: String) -> Self {
-        attribute("onloadeddata", value, true)
+    func onLoadedData(_ value: String?) -> Self {
+        attribute("onloadeddata", value)
     }
 
     /// Script to be run when meta data (like dimensions and duration) are loaded
-    func onLoadedMetadata(_ value: String) -> Self {
-        attribute("onloadedmetadata", value, true)
+    func onLoadedMetadata(_ value: String?) -> Self {
+        attribute("onloadedmetadata", value)
     }
 
     /// Script to be run just as the file begins to load before anything is actually loaded
-    func onLoadStart(_ value: String) -> Self {
-        attribute("onloadstart", value, true)
+    func onLoadStart(_ value: String?) -> Self {
+        attribute("onloadstart", value)
     }
 
     /// Script to be run when the media is paused either by the user or programmatically
-    func onPause(_ value: String) -> Self {
-        attribute("onpause", value, true)
+    func onPause(_ value: String?) -> Self {
+        attribute("onpause", value)
     }
 
     /// Script to be run when the media is ready to start playing
-    func onPlay(_ value: String) -> Self {
-        attribute("onplay", value, true)
+    func onPlay(_ value: String?) -> Self {
+        attribute("onplay", value)
     }
 
     /// Script to be run when the media actually has started playing
-    func onPlaying(_ value: String) -> Self {
-        attribute("onplaying", value, true)
+    func onPlaying(_ value: String?) -> Self {
+        attribute("onplaying", value)
     }
 
     /// Script to be run when the browser is in the process of getting the media data
-    func onProgress(_ value: String) -> Self {
-        attribute("onprogress", value, true)
+    func onProgress(_ value: String?) -> Self {
+        attribute("onprogress", value)
     }
 
     /// Script to be run each time the playback rate changes (like when a user switches to a slow motion or fast forward mode)
-    func onRateChange(_ value: String) -> Self {
-        attribute("onratechange", value, true)
+    func onRateChange(_ value: String?) -> Self {
+        attribute("onratechange", value)
     }
 
     /// Script to be run when the seeking attribute is set to false indicating that seeking has ended
-    func onSeeked(_ value: String) -> Self {
-        attribute("onseeked", value, true)
+    func onSeeked(_ value: String?) -> Self {
+        attribute("onseeked", value)
     }
 
     /// Script to be run when the seeking attribute is set to true indicating that seeking is active
-    func onSeeking(_ value: String) -> Self {
-        attribute("onseeking", value, true)
+    func onSeeking(_ value: String?) -> Self {
+        attribute("onseeking", value)
     }
 
     /// Script to be run when the browser is unable to fetch the media data for whatever reason
-    func onStalled(_ value: String) -> Self {
-        attribute("onstalled", value, true)
+    func onStalled(_ value: String?) -> Self {
+        attribute("onstalled", value)
     }
 
     /// Script to be run when fetching the media data is stopped before it is completely loaded for whatever reason
-    func onSuspend(_ value: String) -> Self {
-        attribute("onsuspend", value, true)
+    func onSuspend(_ value: String?) -> Self {
+        attribute("onsuspend", value)
     }
 
     /// Script to be run when the playing position has changed (like when the user fast forwards to a different point in the media)
-    func onTimeUpdate(_ value: String) -> Self {
-        attribute("ontimeupdate", value, true)
+    func onTimeUpdate(_ value: String?) -> Self {
+        attribute("ontimeupdate", value)
     }
 
     /// Script to be run each time the volume is changed which (includes setting the volume to "mute")
-    func onVolumeChange(_ value: String) -> Self {
-        attribute("onvolumechange", value, true)
+    func onVolumeChange(_ value: String?) -> Self {
+        attribute("onvolumechange", value)
     }
 
     /// Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
-    func onWaiting(_ value: String) -> Self {
-        attribute("onwaiting", value, true)
+    func onWaiting(_ value: String?) -> Self {
+        attribute("onwaiting", value)
     }
     
     // MARK: - Misc Events
     
     /// Fires when the user opens or closes the <details> element
-    func onToggle(_ value: String) -> Self {
-        attribute("ontoggle", value, true)
+    func onToggle(_ value: String?) -> Self {
+        attribute("ontoggle", value)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 600584e..9918acd 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,15 +15,34 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
+    public private(set) var eventFuncs: [BodyEvent : [JsFunction]]?
     
     public init(scripts: [Script]? = nil,
+                eventFuncs efs: [BodyEvent : [JsFunction]]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
+        self.eventFuncs = efs
         let temp = Tag {
             if let children = children { children }
             if let scripts = scripts { scripts }
         }
         super.init(temp.children)
+        _ = self
+            .onAfterPrint(efs?[.onAfterPrint])
+            .onBeforePrint(efs?[.onBeforePrint])
+            .onBeforeUnload(efs?[.onBeforeUnload])
+            .onError(efs?[.onError])
+            .onHashChange(efs?[.onHashChange])
+            .onLoad(efs?[.onLoad])
+            .onMessage(efs?[.onMessage])
+            .onOffline(efs?[.onOffline])
+            .onOnline(efs?[.onOnline])
+            .onPageHide(efs?[.onPageHide])
+            .onPageShow(efs?[.onPageShow])
+            .onPopState(efs?[.onPopState])
+            .onResize(efs?[.onResize])
+            .onStorage(efs?[.onStorage])
+            .onUnload(efs?[.onUnload])
     }
     
     public convenience init(scripts: [Script] = [],
@@ -31,3 +50,33 @@ open class Body: StandardTag {
         self.init(scripts: scripts, [builder()])
     }
 }
+
+extension Body {
+    
+    public enum BodyEvent: String {
+        case onAfterPrint   // run after the document is printed
+        case onBeforePrint  // run before the document is printed
+        case onBeforeUnload // run when the document is about to be unloaded
+        case onError        // run when an error occurs
+        case onHashChange   // run when there has been changes to the anchor part of the a URL
+        case onLoad         // fires after the page is finished loading
+        case onMessage      // run when the message is triggered
+        case onOffline      // run when the browser starts to work offline
+        case onOnline       // run when the browser starts to work online
+        case onPageHide     // run when a user navigates away from a page
+        case onPageShow     // run when a user navigates to a page
+        case onPopState     // run when the window's history changes
+        case onResize       // fires when the browser window is resized
+        case onStorage      // run when a Web Storage area is updated
+        case onUnload       // fires once a page has unloaded (or the browser window has been closed)
+    }
+    
+    public typealias JsFunction = String
+}
+
+extension Dictionary where Key == Body.BodyEvent, Value == [Body.JsFunction] {
+    
+    subscript(key: Key) -> String? {
+        self[key]?.joined(separator: ";\r")
+    }
+}

From 466cef395e6fe8355f1c6f91c3518d5852244dd0 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:13:32 -0400
Subject: [PATCH 098/141] Events now enum Body handles events

---
 Sources/SwiftHtml/Attributes/Events.swift | 477 +++++-----------------
 Sources/SwiftHtml/Tags/Body.swift         |  67 +--
 2 files changed, 130 insertions(+), 414 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 8c72eb2..0464aab 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -7,376 +7,121 @@
 
 public extension Tag {
     
-    // MARK: - Window Event Attributes
-    
-    /// Script to be run after the document is printed
-    func onAfterPrint(_ value: String?) -> Self {
-        attribute("onafterprint", value)
-    }
-    
-    /// Script to be run before the document is printed
-    func onBeforePrint(_ value: String?) -> Self {
-        attribute("onbeforeprint", value)
-    }
-    
-    /// Script to be run when the document is about to be unloaded
-    func onBeforeUnload(_ value: String?) -> Self {
-        attribute("onbeforeunload", value)
-    }
-    
-    /// Script to be run when an error occurs
-    func onError(_ value: String?) -> Self {
-        attribute("onerror", value)
-    }
-    
-    /// Script to be run when there has been changes to the anchor part of the a URL
-    func onHashChange(_ value: String?) -> Self {
-        attribute("onhashchange", value)
-    }
-    
-    /// Fires after the page is finished loading
-    func onLoad(_ value: String?) -> Self {
-        attribute("onload", value)
-    }
-    
-    /// Script to be run when the message is triggered
-    func onMessage(_ value: String?) -> Self {
-        attribute("onmessage", value)
-    }
-    
-    /// Script to be run when the browser starts to work offline
-    func onOffline(_ value: String?) -> Self {
-        attribute("onoffline", value)
-    }
-    
-    /// Script to be run when the browser starts to work online
-    func onOnline(_ value: String?) -> Self {
-        attribute("ononline", value)
-    }
-    
-    /// Script to be run when a user navigates away from a page
-    func onPageHide(_ value: String?) -> Self {
-        attribute("onpagehide", value)
-    }
-    
-    /// Script to be run when a user navigates to a page
-    func onPageShow(_ value: String?) -> Self {
-        attribute("onpageshow", value)
-    }
-    
-    /// Script to be run when the window's history changes
-    func onPopState(_ value: String?) -> Self {
-        attribute("onpopstate", value)
-    }
-    
-    /// Fires when the browser window is resized
-    func onResize(_ value: String?) -> Self {
-        attribute("onresize", value)
-    }
-    
-    /// Script to be run when a Web Storage area is updated
-    func onStorage(_ value: String?) -> Self {
-        attribute("onstorage", value)
-    }
-    
-    /// Fires once a page has unloaded (or the browser window has been closed)
-    func onUnload(_ value: String?) -> Self {
-        attribute("onunload", value)
-    }
-    
-    // MARK: - Form Events
-    
-    /// Fires the moment that the element loses focus
-    func onBlur(_ value: String?) -> Self {
-        attribute("onblur", value)
-    }
-
-    /// Fires the moment when the value of the element is changed
-    func onChange(_ value: String?) -> Self {
-        attribute("onchange", value)
-    }
-
-    /// Script to be run when a context menu is triggered
-    func onContextMenu(_ value: String?) -> Self {
-        attribute("oncontextmenu", value)
-    }
-
-    /// Fires the moment when the element gets focus
-    func onFocus(_ value: String?) -> Self {
-        attribute("onfocus", value)
-    }
-
-    /// Script to be run when an element gets user input
-    func onInput(_ value: String?) -> Self {
-        attribute("oninput", value)
-    }
-
-    /// Script to be run when an element is invalid
-    func onInvalid(_ value: String?) -> Self {
-        attribute("oninvalid", value)
-    }
-
-    /// Fires when the Reset button in a form is clicked
-    func onReset(_ value: String?) -> Self {
-        attribute("onreset", value)
-    }
-
-    /// Fires when the user writes something in a search field (for <input="search">)
-    func onSearch(_ value: String?) -> Self {
-        attribute("onsearch", value)
-    }
-
-    /// Fires after some text has been selected in an element
-    func onSelect(_ value: String?) -> Self {
-        attribute("onselect", value)
-    }
-
-    /// Fires when a form is submitted
-    func onSubmit(_ value: String?) -> Self {
-        attribute("onsubmit", value)
-    }
-    
-    // MARK: - Keyboard Events
-    
-
-    /// Fires when a user is pressing a key
-    func onKeyDown(_ value: String?) -> Self {
-        attribute("onkeydown", value)
-    }
-
-    /// Fires when a user presses a key
-    func onKeyPress(_ value: String?) -> Self {
-        attribute("onkeypress", value)
-    }
-
-    /// Fires when a user releases a key
-    func onKeyUp(_ value: String?) -> Self {
-        attribute("onkeyup", value)
-    }
-    
-    // MARK: - Mouse Events
-    
-
-    /// Fires on a mouse click on the element
-    func onClick(_ value: String?) -> Self {
-        attribute("onclick", value)
-    }
-
-    /// Fires on a mouse double-click on the element
-    func onDoubleClick(_ value: String?) -> Self {
-        attribute("ondblclick", value)
-    }
-
-    /// Fires when a mouse button is pressed down on an element
-    func onMouseDown(_ value: String?) -> Self {
-        attribute("onmousedown", value)
-    }
-
-    /// Fires when the mouse pointer is moving while it is over an element
-    func onMouseMove(_ value: String?) -> Self {
-        attribute("onmousemove", value)
-    }
-
-    /// Fires when the mouse pointer moves out of an element
-    func onMouseOut(_ value: String?) -> Self {
-        attribute("onmouseout", value)
-    }
-
-    /// Fires when the mouse pointer moves over an element
-    func onMouseOver(_ value: String?) -> Self {
-        attribute("onmouseover", value)
-    }
-
-    /// Fires when a mouse button is released over an element
-    func onMouseUp(_ value: String?) -> Self {
-        attribute("onmouseup", value)
-    }
-
-    /// Fires when the mouse wheel rolls up or down over an element
-    func onWheel(_ value: String?) -> Self {
-        attribute("onwheel", value)
-    }
-    
-    // MARK: - Drag Events
-
-    /// Script to be run when an element is dragged
-    func onDrag(_ value: String?) -> Self {
-        attribute("ondrag", value)
-    }
-
-    /// Script to be run at the end of a drag operation
-    func onDragEnd(_ value: String?) -> Self {
-        attribute("ondragend", value)
-    }
-
-    /// Script to be run when an element has been dragged to a valid drop target
-    func onDragEnter(_ value: String?) -> Self {
-        attribute("ondragenter", value)
-    }
-
-    /// Script to be run when an element leaves a valid drop target
-    func onDragLeave(_ value: String?) -> Self {
-        attribute("ondragleave", value)
-    }
-
-    /// Script to be run when an element is being dragged over a valid drop target
-    func onDragOver(_ value: String?) -> Self {
-        attribute("ondragover", value)
-    }
-
-    /// Script to be run at the start of a drag operation
-    func onDragStart(_ value: String?) -> Self {
-        attribute("ondragstart", value)
-    }
-
-    /// Script to be run when dragged element is being dropped
-    func onDrop(_ value: String?) -> Self {
-        attribute("ondrop", value)
-    }
-
-    /// Script to be run when an element's scrollbar is being scrolled
-    func onScroll(_ value: String?) -> Self {
-        attribute("onscroll", value)
-    }
-    
-    // MARK: - Clipboard Events
-
-    /// Fires when the user copies the content of an element
-    func onCopy(_ value: String?) -> Self {
-        attribute("oncopy", value)
-    }
-
-    /// Fires when the user cuts the content of an element
-    func onCut(_ value: String?) -> Self {
-        attribute("oncut", value)
-    }
-
-    /// Fires when the user pastes some content in an element
-    func onPaste(_ value: String?) -> Self {
-        attribute("onpaste", value)
-    }
-    
-    // MARK: - Media Events
-    
-    /// Script to be run on abort
-    func onAbort(_ value: String?) -> Self {
-        attribute("onabort", value)
-    }
-
-    /// Script to be run when a file is ready to start playing (when it has buffered enough to begin)
-    func onCanPlay(_ value: String?) -> Self {
-        attribute("oncanplay", value)
-    }
-
-    /// Script to be run when a file can be played all the way to the end without pausing for buffering
-    func onCanPlaythrough(_ value: String?) -> Self {
-        attribute("oncanplaythrough", value)
-    }
-
-    /// Script to be run when the cue changes in a <track> element
-    func onCueChange(_ value: String?) -> Self {
-        attribute("oncuechange", value)
-    }
-
-    /// Script to be run when the length of the media changes
-    func onDurationChange(_ value: String?) -> Self {
-        attribute("ondurationchange", value)
-    }
-
-    /// Script to be run when something bad happens and the file is suddenly unavailable (like unexpectedly disconnects)
-    func onEmptied(_ value: String?) -> Self {
-        attribute("onemptied", value)
-    }
-
-    /// Script to be run when the media has reach the end (a useful event for messages like "thanks for listening")
-    func onEnded(_ value: String?) -> Self {
-        attribute("onended", value)
-    }
-
-    /// Script to be run when an error occurs when the file is being loaded
-//    func onError(_ value: String?) -> Self {
-//        attribute("onerror", value)
-//    }
-
-    /// Script to be run when media data is loaded
-    func onLoadedData(_ value: String?) -> Self {
-        attribute("onloadeddata", value)
-    }
-
-    /// Script to be run when meta data (like dimensions and duration) are loaded
-    func onLoadedMetadata(_ value: String?) -> Self {
-        attribute("onloadedmetadata", value)
-    }
-
-    /// Script to be run just as the file begins to load before anything is actually loaded
-    func onLoadStart(_ value: String?) -> Self {
-        attribute("onloadstart", value)
-    }
-
-    /// Script to be run when the media is paused either by the user or programmatically
-    func onPause(_ value: String?) -> Self {
-        attribute("onpause", value)
-    }
-
-    /// Script to be run when the media is ready to start playing
-    func onPlay(_ value: String?) -> Self {
-        attribute("onplay", value)
-    }
-
-    /// Script to be run when the media actually has started playing
-    func onPlaying(_ value: String?) -> Self {
-        attribute("onplaying", value)
-    }
-
-    /// Script to be run when the browser is in the process of getting the media data
-    func onProgress(_ value: String?) -> Self {
-        attribute("onprogress", value)
-    }
-
-    /// Script to be run each time the playback rate changes (like when a user switches to a slow motion or fast forward mode)
-    func onRateChange(_ value: String?) -> Self {
-        attribute("onratechange", value)
-    }
-
-    /// Script to be run when the seeking attribute is set to false indicating that seeking has ended
-    func onSeeked(_ value: String?) -> Self {
-        attribute("onseeked", value)
-    }
-
-    /// Script to be run when the seeking attribute is set to true indicating that seeking is active
-    func onSeeking(_ value: String?) -> Self {
-        attribute("onseeking", value)
-    }
-
-    /// Script to be run when the browser is unable to fetch the media data for whatever reason
-    func onStalled(_ value: String?) -> Self {
-        attribute("onstalled", value)
-    }
-
-    /// Script to be run when fetching the media data is stopped before it is completely loaded for whatever reason
-    func onSuspend(_ value: String?) -> Self {
-        attribute("onsuspend", value)
-    }
-
-    /// Script to be run when the playing position has changed (like when the user fast forwards to a different point in the media)
-    func onTimeUpdate(_ value: String?) -> Self {
-        attribute("ontimeupdate", value)
+    typealias JSFunction = String
+    
+    enum Event: String {
+        // Windows
+        case onAfterPrint       // Script to be run after the document is printed
+        case onBeforePrint      // Script to be run before the document is printed
+        case onBeforeUnload     // Script to be run when the document is about to be unloaded
+        case onError            // Script to be run when an error occurs
+        case onHashChange       // Script to be run when there has been changes to the anchor part of the a URL
+        case onLoad             // Fires after the page is finished loading
+        case onMessage          // Script to be run when the message is triggered
+        case onOffline          // Script to be run when the browser starts to work offline
+        case onOnline           // Script to be run when the browser starts to work online
+        case onPageHide         // Script to be run when a user navigates away from a page
+        case onPageShow         // Script to be run when a user navigates to a page
+        case onPopState         // Script to be run when the window's history changes
+        case onResize           // Fires when the browser window is resized
+        case onStorage          // Script to be run when a Web Storage area is updated
+        case onUnload           // Fires once a page has unloaded (or the browser window has been closed)
+        // Forms
+        case onBlur             // Fires the moment that the element loses focus
+        case onChange           // Fires the moment when the value of the element is changed
+        case onContextMenu      // Script to be run when a context menu is triggered
+        case onFocus            // Fires the moment when the element gets focus
+        case onInput            // Script to be run when an element gets user input
+        case onInvalid          // Script to be run when an element is invalid
+        case onReset            // Fires when the Reset button in a form is clicked
+        case onSearch           // Fires when the user writes something in a search field (for <input="search">)
+        case onSelect           // Fires after some text has been selected in an element
+        case onSubmit           // Fires when a form is submitted
+        // Keyboard
+        case onKeyDown          // Fires when a user is pressing a key
+        case onKeyPress         // Fires when a user presses a key
+        case onKeyUp            // Fires when a user releases a key
+        // Mouse
+        case onClick            // Fires on a mouse click on the element
+        case onDoubleClick      // Fires on a mouse double-click on the element
+        case onMouseDown        // Fires when a mouse button is pressed down on an element
+        case onMouseMove        // Fires when the mouse pointer is moving while it is over an element
+        case onMouseOut         // Fires when the mouse pointer moves out of an element
+        case onMouseOver        // Fires when the mouse pointer moves over an element
+        case onMouseUp          // Fires when a mouse button is released over an element
+        case onWheel            // Fires when the mouse wheel rolls up or down over an element
+        // Drag and Drop
+        case onDrag             // Script to be run when an element is dragged
+        case onDragEnd          // Script to be run at the end of a drag operation
+        case onDragEnter        // Script to be run when an element has been dragged to a valid drop target
+        case onDragLeave        // Script to be run when an element leaves a valid drop target
+        case onDragOver         // Script to be run when an element is being dragged over a valid drop target
+        case onDragStart        // Script to be run at the start of a drag operation
+        case onDrop             // Script to be run when dragged element is being dropped
+        case onScroll           // Script to be run when an element's scrollbar is being scrolled
+        // Clipboard
+        case onCopy             // Fires when the user copies the content of an element
+        case onCut              // Fires when the user cuts the content of an element
+        case onPaste            // Fires when the user pastes some content in an element
+        // Media
+        case onAbort            // Script to be run on abort
+        case onCanPlay          // Script to be run when a file is ready to start playing (when it has buffered enough to begin)
+        case onCanPlaythrough   // Script to be run when a file can be played all the way to the end without pausing for buffering
+        case onCueChange        // Script to be run when the cue changes in a <track> element
+        case onDurationChange   // Script to be run when the length of the media changes
+        case onEmptied          // Script to be run when something bad happens and the file is suddenly unavailable (like unexpectedly disconnects)
+        case onEnded            // Script to be run when the media has reach the end (a useful event for messages like "thanks for listening")
+        case onLoadedData       // Script to be run when media data is loaded
+        case onLoadedMetadata   // Script to be run when meta data (like dimensions and duration) are loaded
+        case onLoadStart        // Script to be run just as the file begins to load before anything is actually loaded
+        case onPause            // Script to be run when the media is paused either by the user or programmatically
+        case onPlay             // Script to be run when the media is ready to start playing
+        case onPlaying          // Script to be run when the media actually has started playing
+        case onProgress         // Script to be run when the browser is in the process of getting the media data
+        case onRateChange       // Script to be run each time the playback rate changes (like when a user switches to a slow motion or fast forward mode)
+        case onSeeked           // Script to be run when the seeking attribute is set to false indicating that seeking has ended
+        case onSeeking          // Script to be run when the seeking attribute is set to true indicating that seeking is active
+        case onStalled          // Script to be run when the browser is unable to fetch the media data for whatever reason
+        case onSuspend          // Script to be run when fetching the media data is stopped before it is completely loaded for whatever reason
+        case onTimeUpdate       // Script to be run when the playing position has changed (like when the user fast forwards to a different point in the media)
+        case onVolumeChange     // Script to be run each time the volume is changed which (includes setting the volume to "mute")
+        case onWaiting          // Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
+        // Misc
+        case onToggle           // Fires when the user opens or closes the <details> element
+    }
+    
+    struct EventFunction {
+        let event: Event
+        let function: JSFunction
+    }
+    
+    func onEvent(_ e: Event, function: JSFunction?, _ condition: Bool = true) -> Self {
+        attribute(e.rawValue.lowercased(), function, condition)
+    }
+    
+    func onEvent(_ ef: EventFunction?, _ condition: Bool = true) -> Self {
+        guard let event = ef?.event else { return self }
+        return onEvent(event, function: ef?.function, condition)
     }
+}
 
-    /// Script to be run each time the volume is changed which (includes setting the volume to "mute")
-    func onVolumeChange(_ value: String?) -> Self {
-        attribute("onvolumechange", value)
-    }
+extension Dictionary where Key == Tag.Event, Value == Tag.JSFunction {
 
-    /// Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
-    func onWaiting(_ value: String?) -> Self {
-        attribute("onwaiting", value)
+    // convert [EventFunction] to [Event:JSFunction] where JSFunctions combined with ";\r"
+    init(_ efs: [Tag.EventFunction]) {
+        self = [:]
+        _ = efs.map{
+            if let existing = self[$0.event] {
+                self[$0.event] = existing + ";\r" + $0.function
+            } else {
+                self[$0.event] = $0.function
+            }
+        }
     }
     
-    // MARK: - Misc Events
-    
-    /// Fires when the user opens or closes the <details> element
-    func onToggle(_ value: String?) -> Self {
-        attribute("ontoggle", value)
+    // retrieve from dictionary as Tag.EventFunction
+    subscript(key: Key) -> Tag.EventFunction? {
+        guard let value = self[key] else { return nil }
+        return Tag.EventFunction(event: key, function: value)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 9918acd..cae5b0a 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,34 +15,35 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
-    public private(set) var eventFuncs: [BodyEvent : [JsFunction]]?
+    public private(set) var eventFuncs: [Event:JSFunction]?
     
     public init(scripts: [Script]? = nil,
-                eventFuncs efs: [BodyEvent : [JsFunction]]? = nil,
+                eventFuncs efs: [EventFunction]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
-        self.eventFuncs = efs
+        // convert [EventFunction] to [Event:JSFunction]
+        self.eventFuncs = efs != nil ? .init(efs!) : nil
         let temp = Tag {
             if let children = children { children }
             if let scripts = scripts { scripts }
         }
         super.init(temp.children)
         _ = self
-            .onAfterPrint(efs?[.onAfterPrint])
-            .onBeforePrint(efs?[.onBeforePrint])
-            .onBeforeUnload(efs?[.onBeforeUnload])
-            .onError(efs?[.onError])
-            .onHashChange(efs?[.onHashChange])
-            .onLoad(efs?[.onLoad])
-            .onMessage(efs?[.onMessage])
-            .onOffline(efs?[.onOffline])
-            .onOnline(efs?[.onOnline])
-            .onPageHide(efs?[.onPageHide])
-            .onPageShow(efs?[.onPageShow])
-            .onPopState(efs?[.onPopState])
-            .onResize(efs?[.onResize])
-            .onStorage(efs?[.onStorage])
-            .onUnload(efs?[.onUnload])
+            .onEvent(eventFuncs?[.onAfterPrint])
+            .onEvent(eventFuncs?[.onBeforePrint])
+            .onEvent(eventFuncs?[.onBeforeUnload])
+            .onEvent(eventFuncs?[.onError])
+            .onEvent(eventFuncs?[.onHashChange])
+            .onEvent(eventFuncs?[.onLoad])
+            .onEvent(eventFuncs?[.onMessage])
+            .onEvent(eventFuncs?[.onOffline])
+            .onEvent(eventFuncs?[.onOnline])
+            .onEvent(eventFuncs?[.onPageHide])
+            .onEvent(eventFuncs?[.onPageShow])
+            .onEvent(eventFuncs?[.onPopState])
+            .onEvent(eventFuncs?[.onResize])
+            .onEvent(eventFuncs?[.onStorage])
+            .onEvent(eventFuncs?[.onUnload])
     }
     
     public convenience init(scripts: [Script] = [],
@@ -50,33 +51,3 @@ open class Body: StandardTag {
         self.init(scripts: scripts, [builder()])
     }
 }
-
-extension Body {
-    
-    public enum BodyEvent: String {
-        case onAfterPrint   // run after the document is printed
-        case onBeforePrint  // run before the document is printed
-        case onBeforeUnload // run when the document is about to be unloaded
-        case onError        // run when an error occurs
-        case onHashChange   // run when there has been changes to the anchor part of the a URL
-        case onLoad         // fires after the page is finished loading
-        case onMessage      // run when the message is triggered
-        case onOffline      // run when the browser starts to work offline
-        case onOnline       // run when the browser starts to work online
-        case onPageHide     // run when a user navigates away from a page
-        case onPageShow     // run when a user navigates to a page
-        case onPopState     // run when the window's history changes
-        case onResize       // fires when the browser window is resized
-        case onStorage      // run when a Web Storage area is updated
-        case onUnload       // fires once a page has unloaded (or the browser window has been closed)
-    }
-    
-    public typealias JsFunction = String
-}
-
-extension Dictionary where Key == Body.BodyEvent, Value == [Body.JsFunction] {
-    
-    subscript(key: Key) -> String? {
-        self[key]?.joined(separator: ";\r")
-    }
-}

From b8df153ecd7498567aa1f761c760e6701241cf9b Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:36:16 -0400
Subject: [PATCH 099/141] Tag > appendToAttribute() Event > onEvents()

---
 Sources/SwiftHtml/Attributes/Events.swift | 32 +++++------------------
 Sources/SwiftHtml/Tags/Body.swift         | 24 +++--------------
 Sources/SwiftSgml/Tag.swift               | 13 +++++++++
 3 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 0464aab..bff3201 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -95,33 +95,15 @@ public extension Tag {
         let function: JSFunction
     }
     
-    func onEvent(_ e: Event, function: JSFunction?, _ condition: Bool = true) -> Self {
+    @discardableResult
+    func onEvent(_ e: Event, _ function: JSFunction?, _ condition: Bool = true) -> Self {
         attribute(e.rawValue.lowercased(), function, condition)
     }
     
-    func onEvent(_ ef: EventFunction?, _ condition: Bool = true) -> Self {
-        guard let event = ef?.event else { return self }
-        return onEvent(event, function: ef?.function, condition)
-    }
-}
-
-extension Dictionary where Key == Tag.Event, Value == Tag.JSFunction {
-
-    // convert [EventFunction] to [Event:JSFunction] where JSFunctions combined with ";\r"
-    init(_ efs: [Tag.EventFunction]) {
-        self = [:]
-        _ = efs.map{
-            if let existing = self[$0.event] {
-                self[$0.event] = existing + ";\r" + $0.function
-            } else {
-                self[$0.event] = $0.function
-            }
-        }
-    }
-    
-    // retrieve from dictionary as Tag.EventFunction
-    subscript(key: Key) -> Tag.EventFunction? {
-        guard let value = self[key] else { return nil }
-        return Tag.EventFunction(event: key, function: value)
+    @discardableResult
+    func onEvents(_ efs: [EventFunction]?, condition: Bool = true) -> Self {
+        guard let efs = efs, condition else { return self }
+        _ = efs.map { appendToAttribute($0.event.rawValue, $0.function, separator: ";\r") }
+        return self
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index cae5b0a..0899693 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,35 +15,19 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
-    public private(set) var eventFuncs: [Event:JSFunction]?
+    public private(set) var eventFuncs: [EventFunction]?
     
     public init(scripts: [Script]? = nil,
-                eventFuncs efs: [EventFunction]? = nil,
+                eventFuncs: [EventFunction]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
-        // convert [EventFunction] to [Event:JSFunction]
-        self.eventFuncs = efs != nil ? .init(efs!) : nil
+        self.eventFuncs = eventFuncs
         let temp = Tag {
             if let children = children { children }
             if let scripts = scripts { scripts }
         }
         super.init(temp.children)
-        _ = self
-            .onEvent(eventFuncs?[.onAfterPrint])
-            .onEvent(eventFuncs?[.onBeforePrint])
-            .onEvent(eventFuncs?[.onBeforeUnload])
-            .onEvent(eventFuncs?[.onError])
-            .onEvent(eventFuncs?[.onHashChange])
-            .onEvent(eventFuncs?[.onLoad])
-            .onEvent(eventFuncs?[.onMessage])
-            .onEvent(eventFuncs?[.onOffline])
-            .onEvent(eventFuncs?[.onOnline])
-            .onEvent(eventFuncs?[.onPageHide])
-            .onEvent(eventFuncs?[.onPageShow])
-            .onEvent(eventFuncs?[.onPopState])
-            .onEvent(eventFuncs?[.onResize])
-            .onEvent(eventFuncs?[.onStorage])
-            .onEvent(eventFuncs?[.onUnload])
+        self.onEvents(eventFuncs)
     }
     
     public convenience init(scripts: [Script] = [],
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 2714c7d..2036500 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -105,6 +105,19 @@ open class Tag {
         return self
     }
     
+    @discardableResult
+    public func appendToAttribute(_ key: String, _ value: String?, separator: String? = nil, _ condition: Bool = true) -> Self {
+        guard condition else { return self }
+        let attribute: Attribute
+        if let existing = attributes?.first(where: { $0.key == key }) {
+            attribute = .init(key: key, value: (existing.value ?? "") + (separator ?? "") + (value ?? ""))
+        } else {
+            attribute = .init(key: key, value: value)
+        }
+        upsert(attribute)
+        return self
+    }
+    
     /// add a new attribute with a given value if the condition is true
     @discardableResult
     public func attribute(_ key: String, _ value: String?, _ condition: Bool = true) -> Self {

From 11b6e3cb40147335702be9e51c978d04aed218d7 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:24:30 -0400
Subject: [PATCH 100/141] Move Event from Tag to Attribute

---
 Sources/SwiftHtml/Attributes/Events.swift | 9 ++++++---
 Sources/SwiftHtml/Tags/Body.swift         | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index bff3201..521e555 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 07. 23..
 //
 
-public extension Tag {
+public extension Attribute {
     
     typealias JSFunction = String
     
@@ -94,14 +94,17 @@ public extension Tag {
         let event: Event
         let function: JSFunction
     }
+}
+
+extension Tag {
     
     @discardableResult
-    func onEvent(_ e: Event, _ function: JSFunction?, _ condition: Bool = true) -> Self {
+    func onEvent(_ e: Attribute.Event, _ function: Attribute.JSFunction?, _ condition: Bool = true) -> Self {
         attribute(e.rawValue.lowercased(), function, condition)
     }
     
     @discardableResult
-    func onEvents(_ efs: [EventFunction]?, condition: Bool = true) -> Self {
+    func onEvents(_ efs: [Attribute.EventFunction]?, condition: Bool = true) -> Self {
         guard let efs = efs, condition else { return self }
         _ = efs.map { appendToAttribute($0.event.rawValue, $0.function, separator: ";\r") }
         return self
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 0899693..c4eac48 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,10 +15,10 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
-    public private(set) var eventFuncs: [EventFunction]?
+    public private(set) var eventFuncs: [Attribute.EventFunction]?
     
     public init(scripts: [Script]? = nil,
-                eventFuncs: [EventFunction]? = nil,
+                eventFuncs: [Attribute.EventFunction]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
         self.eventFuncs = eventFuncs

From ac5bb30b9337acfde193f912a0d4270343f2bfd6 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:26:58 -0400
Subject: [PATCH 101/141] Make Event extensions on Tag public

---
 Sources/SwiftHtml/Attributes/Events.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 521e555..cf8fd8c 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -96,7 +96,7 @@ public extension Attribute {
     }
 }
 
-extension Tag {
+public extension Tag {
     
     @discardableResult
     func onEvent(_ e: Attribute.Event, _ function: Attribute.JSFunction?, _ condition: Bool = true) -> Self {

From 4e8054c6f0bfdd4f058b1d4a226ea8fdadb4622c Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:49:09 -0400
Subject: [PATCH 102/141] Update convenience init()

---
 Sources/SwiftHtml/Tags/Body.swift | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index c4eac48..1752554 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -15,23 +15,26 @@ open class Body: StandardTag {
     override open class var name: String { .init(Body.self) }
     
     public private(set) var scripts: [Script]?
-    public private(set) var eventFuncs: [Attribute.EventFunction]?
+    public private(set) var eventFunctions: [Attribute.EventFunction]?
     
     public init(scripts: [Script]? = nil,
-                eventFuncs: [Attribute.EventFunction]? = nil,
+                eventFunctions: [Attribute.EventFunction]? = nil,
                 _ children: [Tag]? = nil) {
         self.scripts = scripts ?? []
-        self.eventFuncs = eventFuncs
+        self.eventFunctions = eventFunctions
         let temp = Tag {
             if let children = children { children }
             if let scripts = scripts { scripts }
         }
         super.init(temp.children)
-        self.onEvents(eventFuncs)
+        self.onEvents(eventFunctions)
     }
     
     public convenience init(scripts: [Script] = [],
+                            eventFunctions: [Attribute.EventFunction]? = nil,
                             @TagBuilder _ builder: () -> Tag) {
-        self.init(scripts: scripts, [builder()])
+        self.init(scripts: scripts,
+                  eventFunctions: eventFunctions,
+                  [builder()])
     }
 }

From 1f5c86be090b39d45658f5757c760967114da676 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:00:47 -0400
Subject: [PATCH 103/141] Typo

---
 Sources/SwiftSgml/Tag.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 2036500..6edafe2 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -15,7 +15,7 @@ open class Tag {
         case standard   // <name></name>
     }
     
-    public let kind: Kind?    // type == nil only children rendered
+    public let kind: Kind?    // == nil only children rendered
     public let name: String
     public var contents: String?
     public internal(set) var attributes: [Attribute]?

From f9863ed784122e9d1ed732d29c2d01af6c460707 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 11:17:10 -0400
Subject: [PATCH 104/141] Use String(describing:) to generate tag name from
 class name

---
 Sources/SwiftHtml/Tags/A.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Abbr.swift              |  2 +-
 Sources/SwiftHtml/Tags/Address.swift           |  2 +-
 Sources/SwiftHtml/Tags/Area.swift              |  2 +-
 Sources/SwiftHtml/Tags/Article.swift           |  2 +-
 Sources/SwiftHtml/Tags/Aside.swift             |  2 +-
 Sources/SwiftHtml/Tags/Audio.swift             |  2 +-
 Sources/SwiftHtml/Tags/B.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Base.swift              |  2 +-
 Sources/SwiftHtml/Tags/Bdi.swift               |  2 +-
 Sources/SwiftHtml/Tags/Bdo.swift               |  2 +-
 Sources/SwiftHtml/Tags/Blockquote.swift        |  2 +-
 Sources/SwiftHtml/Tags/Body.swift              |  2 +-
 Sources/SwiftHtml/Tags/Br.swift                |  2 +-
 Sources/SwiftHtml/Tags/Button.swift            |  2 +-
 Sources/SwiftHtml/Tags/Canvas.swift            |  2 +-
 Sources/SwiftHtml/Tags/Caption.swift           |  2 +-
 Sources/SwiftHtml/Tags/Cite.swift              |  2 +-
 Sources/SwiftHtml/Tags/Code.swift              |  2 +-
 Sources/SwiftHtml/Tags/Col.swift               |  2 +-
 Sources/SwiftHtml/Tags/Colgroup.swift          |  2 +-
 Sources/SwiftHtml/Tags/Comment.swift           |  2 +-
 Sources/SwiftHtml/Tags/Data.swift              |  2 +-
 Sources/SwiftHtml/Tags/Datalist.swift          |  2 +-
 Sources/SwiftHtml/Tags/Dd.swift                |  2 +-
 Sources/SwiftHtml/Tags/Del.swift               |  2 +-
 Sources/SwiftHtml/Tags/Details.swift           |  2 +-
 Sources/SwiftHtml/Tags/Dfn.swift               |  2 +-
 Sources/SwiftHtml/Tags/Dialog.swift            |  2 +-
 Sources/SwiftHtml/Tags/Div.swift               |  2 +-
 Sources/SwiftHtml/Tags/Dl.swift                |  2 +-
 Sources/SwiftHtml/Tags/Dt.swift                |  2 +-
 Sources/SwiftHtml/Tags/Em.swift                |  2 +-
 Sources/SwiftHtml/Tags/Embed.swift             |  2 +-
 Sources/SwiftHtml/Tags/Fieldset.swift          |  2 +-
 Sources/SwiftHtml/Tags/Figcaption.swift        |  2 +-
 Sources/SwiftHtml/Tags/Figure.swift            |  2 +-
 Sources/SwiftHtml/Tags/Footer.swift            |  2 +-
 Sources/SwiftHtml/Tags/Form.swift              |  2 +-
 Sources/SwiftHtml/Tags/H1.swift                |  2 +-
 Sources/SwiftHtml/Tags/H2.swift                |  2 +-
 Sources/SwiftHtml/Tags/H3.swift                |  2 +-
 Sources/SwiftHtml/Tags/H4.swift                |  2 +-
 Sources/SwiftHtml/Tags/H5.swift                |  2 +-
 Sources/SwiftHtml/Tags/H6.swift                |  2 +-
 Sources/SwiftHtml/Tags/Head.swift              |  2 +-
 Sources/SwiftHtml/Tags/Header.swift            |  2 +-
 Sources/SwiftHtml/Tags/Hr.swift                |  2 +-
 Sources/SwiftHtml/Tags/Html.swift              |  2 +-
 Sources/SwiftHtml/Tags/I.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Iframe.swift            |  2 +-
 Sources/SwiftHtml/Tags/Img.swift               |  2 +-
 Sources/SwiftHtml/Tags/Input.swift             |  2 +-
 Sources/SwiftHtml/Tags/Ins.swift               |  2 +-
 Sources/SwiftHtml/Tags/Kbd.swift               |  2 +-
 Sources/SwiftHtml/Tags/Label.swift             |  2 +-
 Sources/SwiftHtml/Tags/Legend.swift            |  2 +-
 Sources/SwiftHtml/Tags/Li.swift                |  2 +-
 Sources/SwiftHtml/Tags/Link.swift              |  2 +-
 Sources/SwiftHtml/Tags/MainTag.swift           |  2 +-
 Sources/SwiftHtml/Tags/Map.swift               |  2 +-
 Sources/SwiftHtml/Tags/Mark.swift              |  2 +-
 Sources/SwiftHtml/Tags/Meta.swift              |  2 +-
 Sources/SwiftHtml/Tags/Meter.swift             |  2 +-
 Sources/SwiftHtml/Tags/Nav.swift               |  2 +-
 Sources/SwiftHtml/Tags/Noscript.swift          |  2 +-
 Sources/SwiftHtml/Tags/Object.swift            |  2 +-
 Sources/SwiftHtml/Tags/Ol.swift                |  2 +-
 Sources/SwiftHtml/Tags/Optgroup.swift          |  2 +-
 Sources/SwiftHtml/Tags/Option.swift            |  2 +-
 Sources/SwiftHtml/Tags/Output.swift            |  2 +-
 Sources/SwiftHtml/Tags/P.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Param.swift             |  2 +-
 Sources/SwiftHtml/Tags/Picture.swift           |  2 +-
 Sources/SwiftHtml/Tags/Pre.swift               |  2 +-
 Sources/SwiftHtml/Tags/Progress.swift          |  2 +-
 Sources/SwiftHtml/Tags/Q.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Rp.swift                |  2 +-
 Sources/SwiftHtml/Tags/Rt.swift                |  2 +-
 Sources/SwiftHtml/Tags/Ruby.swift              |  2 +-
 Sources/SwiftHtml/Tags/S.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Samp.swift              |  2 +-
 Sources/SwiftHtml/Tags/Script.swift            |  2 +-
 Sources/SwiftHtml/Tags/Section.swift           |  2 +-
 Sources/SwiftHtml/Tags/Select.swift            |  2 +-
 Sources/SwiftHtml/Tags/Small.swift             |  2 +-
 Sources/SwiftHtml/Tags/Source.swift            |  2 +-
 Sources/SwiftHtml/Tags/Span.swift              |  2 +-
 Sources/SwiftHtml/Tags/Strong.swift            |  2 +-
 Sources/SwiftHtml/Tags/Style.swift             |  2 +-
 Sources/SwiftHtml/Tags/Sub.swift               |  2 +-
 Sources/SwiftHtml/Tags/Summary.swift           |  2 +-
 Sources/SwiftHtml/Tags/Sup.swift               |  2 +-
 Sources/SwiftHtml/Tags/Table.swift             |  2 +-
 Sources/SwiftHtml/Tags/Tbody.swift             |  2 +-
 Sources/SwiftHtml/Tags/Td.swift                |  2 +-
 Sources/SwiftHtml/Tags/Template.swift          |  2 +-
 Sources/SwiftHtml/Tags/Textarea.swift          |  2 +-
 Sources/SwiftHtml/Tags/Tfoot.swift             |  2 +-
 Sources/SwiftHtml/Tags/Th.swift                |  2 +-
 Sources/SwiftHtml/Tags/Thead.swift             |  2 +-
 Sources/SwiftHtml/Tags/Time.swift              |  2 +-
 Sources/SwiftHtml/Tags/Title.swift             |  2 +-
 Sources/SwiftHtml/Tags/Tr.swift                |  2 +-
 Sources/SwiftHtml/Tags/Track.swift             |  2 +-
 Sources/SwiftHtml/Tags/U.swift                 |  2 +-
 Sources/SwiftHtml/Tags/Ul.swift                |  2 +-
 Sources/SwiftHtml/Tags/Var.swift               |  2 +-
 Sources/SwiftHtml/Tags/Video.swift             |  2 +-
 Sources/SwiftHtml/Tags/Wbr.swift               |  2 +-
 Sources/SwiftRss/Channel.swift                 |  2 +-
 Sources/SwiftRss/Description.swift             |  2 +-
 Sources/SwiftRss/Guid.swift                    |  2 +-
 Sources/SwiftRss/Item.swift                    |  2 +-
 Sources/SwiftRss/Language.swift                |  2 +-
 Sources/SwiftRss/Link.swift                    |  2 +-
 Sources/SwiftRss/Rss.swift                     |  2 +-
 Sources/SwiftRss/Title.swift                   |  2 +-
 Sources/SwiftRss/Ttl.swift                     |  2 +-
 Sources/SwiftSgml/Tag.swift                    | 10 +---------
 Sources/SwiftSitemap/ChangeFreq.swift          |  2 +-
 Sources/SwiftSitemap/LastMod.swift             |  2 +-
 Sources/SwiftSitemap/Loc.swift                 |  2 +-
 Sources/SwiftSitemap/Priority.swift            |  2 +-
 Sources/SwiftSitemap/Sitemap.swift             |  2 +-
 Sources/SwiftSitemap/SitemapIndex.swift        |  2 +-
 Sources/SwiftSitemap/Url.swift                 |  2 +-
 Sources/SwiftSitemap/UrlSet.swift              |  2 +-
 Sources/SwiftSvg/Circle.swift                  |  2 +-
 Sources/SwiftSvg/Ellipse.swift                 |  2 +-
 Sources/SwiftSvg/Line.swift                    |  2 +-
 Sources/SwiftSvg/Path.swift                    |  2 +-
 Sources/SwiftSvg/Polygon.swift                 |  2 +-
 Sources/SwiftSvg/Polyline.swift                |  2 +-
 Sources/SwiftSvg/Rect.swift                    |  2 +-
 Sources/SwiftSvg/Svg.swift                     |  2 +-
 Tests/SwiftHtmlTests/TagCompositionTests.swift |  2 +-
 137 files changed, 137 insertions(+), 145 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index d15e091..8a2e75a 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -16,7 +16,7 @@
 /// - An active link is underlined and red
 open class A: StandardTag {
     
-    override open class var name: String { .init(A.self) }
+    override open class var name: String { .init(describing: A.self).lowercased() }
 }
 
 public extension A {
diff --git a/Sources/SwiftHtml/Tags/Abbr.swift b/Sources/SwiftHtml/Tags/Abbr.swift
index 62346b9..ccc67e0 100644
--- a/Sources/SwiftHtml/Tags/Abbr.swift
+++ b/Sources/SwiftHtml/Tags/Abbr.swift
@@ -10,6 +10,6 @@
 /// **Tip:** Use the global title attribute to show the description for the abbreviation/acronym when you mouse over the element.
 open class Abbr: StandardTag {
     
-    override open class var name: String { .init(Abbr.self) }
+    override open class var name: String { .init(describing: Abbr.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Address.swift b/Sources/SwiftHtml/Tags/Address.swift
index c80ed74..a91a04d 100644
--- a/Sources/SwiftHtml/Tags/Address.swift
+++ b/Sources/SwiftHtml/Tags/Address.swift
@@ -12,5 +12,5 @@
 /// The text in the `<address>` element usually renders in italic, and browsers will always add a line break before and after the `<address>` element.
 open class Address: StandardTag {
     
-    override open class var name: String { .init(Address.self) }
+    override open class var name: String { .init(describing: Address.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Area.swift b/Sources/SwiftHtml/Tags/Area.swift
index f76c58c..d4019c4 100644
--- a/Sources/SwiftHtml/Tags/Area.swift
+++ b/Sources/SwiftHtml/Tags/Area.swift
@@ -51,7 +51,7 @@ open class Area: EmptyTag {
         case poly
     }
     
-    override open class var name: String { .init(Area.self) }    
+    override open class var name: String { .init(describing: Area.self).lowercased() }
 }
 
 public extension Area {
diff --git a/Sources/SwiftHtml/Tags/Article.swift b/Sources/SwiftHtml/Tags/Article.swift
index 87eaf45..1598a07 100644
--- a/Sources/SwiftHtml/Tags/Article.swift
+++ b/Sources/SwiftHtml/Tags/Article.swift
@@ -20,6 +20,6 @@
 /// However, you can use CSS to style the `<article>` element (see example below).
 open class Article: StandardTag {
     
-    override open class var name: String { .init(Article.self) }
+    override open class var name: String { .init(describing: Article.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Aside.swift b/Sources/SwiftHtml/Tags/Aside.swift
index 8e892c4..77f8a4f 100644
--- a/Sources/SwiftHtml/Tags/Aside.swift
+++ b/Sources/SwiftHtml/Tags/Aside.swift
@@ -15,6 +15,6 @@
 /// However, you can use CSS to style the `<aside>` element (see example below).
 open class Aside: StandardTag {
     
-    override open class var name: String { .init(Aside.self) }
+    override open class var name: String { .init(describing: Aside.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Audio.swift b/Sources/SwiftHtml/Tags/Audio.swift
index 45cf4a4..01d81ab 100644
--- a/Sources/SwiftHtml/Tags/Audio.swift
+++ b/Sources/SwiftHtml/Tags/Audio.swift
@@ -23,7 +23,7 @@
 ///      *From Edge 79
 open class Audio: StandardTag {
     
-    override open class var name: String { .init(Audio.self) }
+    override open class var name: String { .init(describing: Audio.self).lowercased() }
 }
 
 public extension Audio {
diff --git a/Sources/SwiftHtml/Tags/B.swift b/Sources/SwiftHtml/Tags/B.swift
index 3bed16f..281b5b4 100644
--- a/Sources/SwiftHtml/Tags/B.swift
+++ b/Sources/SwiftHtml/Tags/B.swift
@@ -8,5 +8,5 @@
 /// Make some text bold (without marking it as important)
 open class B: StandardTag {
     
-    override open class var name: String { .init(B.self) }
+    override open class var name: String { .init(describing: B.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Base.swift b/Sources/SwiftHtml/Tags/Base.swift
index d7515f6..28d5562 100644
--- a/Sources/SwiftHtml/Tags/Base.swift
+++ b/Sources/SwiftHtml/Tags/Base.swift
@@ -12,7 +12,7 @@
 /// There can only be one single `<base>` element in a document, and it must be inside the `<head>` element.
 open class Base: EmptyTag {
     
-    override open class var name: String { .init(Base.self) }
+    override open class var name: String { .init(describing: Base.self).lowercased() }
 }
 
 public extension Base {
diff --git a/Sources/SwiftHtml/Tags/Bdi.swift b/Sources/SwiftHtml/Tags/Bdi.swift
index 6a3d7d7..c7657c7 100644
--- a/Sources/SwiftHtml/Tags/Bdi.swift
+++ b/Sources/SwiftHtml/Tags/Bdi.swift
@@ -12,5 +12,5 @@
 /// This element is useful when embedding user-generated content with an unknown text direction.
 open class Bdi: StandardTag {
     
-    override open class var name: String { .init(Bdi.self) }
+    override open class var name: String { .init(describing: Bdi.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Bdo.swift b/Sources/SwiftHtml/Tags/Bdo.swift
index 5e96567..09c2dcf 100644
--- a/Sources/SwiftHtml/Tags/Bdo.swift
+++ b/Sources/SwiftHtml/Tags/Bdo.swift
@@ -10,7 +10,7 @@
 /// The `<bdo>` tag is used to override the current text direction.
 open class Bdo: StandardTag {
     
-    override open class var name: String { .init(Bdo.self) }
+    override open class var name: String { .init(describing: Bdo.self).lowercased() }
     
     public init(_ contents: String, dir: TextDirection = .ltr) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Blockquote.swift b/Sources/SwiftHtml/Tags/Blockquote.swift
index fccd2dc..d4cf095 100644
--- a/Sources/SwiftHtml/Tags/Blockquote.swift
+++ b/Sources/SwiftHtml/Tags/Blockquote.swift
@@ -10,7 +10,7 @@
 /// Browsers usually indent `<blockquote>` elements (look at example below to see how to remove the indentation).
 open class Blockquote: StandardTag {
     
-    override open class var name: String { .init(Blockquote.self) }
+    override open class var name: String { .init(describing: Blockquote.self).lowercased() }
 }
 
 public extension Blockquote {
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 1752554..7636836 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -12,7 +12,7 @@
 /// **Note:** There can only be one `<body>` element in an HTML document.
 open class Body: StandardTag {
     
-    override open class var name: String { .init(Body.self) }
+    override open class var name: String { .init(describing: Body.self).lowercased() }
     
     public private(set) var scripts: [Script]?
     public private(set) var eventFunctions: [Attribute.EventFunction]?
diff --git a/Sources/SwiftHtml/Tags/Br.swift b/Sources/SwiftHtml/Tags/Br.swift
index 8fffe30..56989e9 100644
--- a/Sources/SwiftHtml/Tags/Br.swift
+++ b/Sources/SwiftHtml/Tags/Br.swift
@@ -12,5 +12,5 @@
 /// The `<br>` tag is an empty tag which means that it has no end tag.
 open class Br: EmptyTag {
     
-    override open class var name: String { .init(Br.self) }    
+    override open class var name: String { .init(describing: Br.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Button.swift b/Sources/SwiftHtml/Tags/Button.swift
index 9cb8cfe..f80be38 100644
--- a/Sources/SwiftHtml/Tags/Button.swift
+++ b/Sources/SwiftHtml/Tags/Button.swift
@@ -14,7 +14,7 @@
 /// **Tip:** You can easily style buttons with CSS! Look at the examples below or visit our CSS Buttons tutorial.
 open class Button: StandardTag {
     
-    override open class var name: String { .init(Button.self) }
+    override open class var name: String { .init(describing: Button.self).lowercased() }
 }
 
 public extension Button {
diff --git a/Sources/SwiftHtml/Tags/Canvas.swift b/Sources/SwiftHtml/Tags/Canvas.swift
index 4b1c7ce..2d3857d 100644
--- a/Sources/SwiftHtml/Tags/Canvas.swift
+++ b/Sources/SwiftHtml/Tags/Canvas.swift
@@ -12,7 +12,7 @@
 /// Any text inside the `<canvas>` element will be displayed in browsers with JavaScript disabled and in browsers that do not support <canvas>.
 open class Canvas: StandardTag {
     
-    override open class var name: String { .init(Canvas.self) }
+    override open class var name: String { .init(describing: Canvas.self).lowercased() }
 }
 
 public extension Canvas {
diff --git a/Sources/SwiftHtml/Tags/Caption.swift b/Sources/SwiftHtml/Tags/Caption.swift
index 65facd7..bbbbffc 100644
--- a/Sources/SwiftHtml/Tags/Caption.swift
+++ b/Sources/SwiftHtml/Tags/Caption.swift
@@ -12,5 +12,5 @@
 /// **Tip:** By default, a table caption will be center-aligned above a table. However, the CSS properties text-align and caption-side can be used to align and place the caption.
 open class Caption: StandardTag {
     
-    override open class var name: String { .init(Caption.self) }
+    override open class var name: String { .init(describing: Caption.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Cite.swift b/Sources/SwiftHtml/Tags/Cite.swift
index a5bcb24..46c512b 100644
--- a/Sources/SwiftHtml/Tags/Cite.swift
+++ b/Sources/SwiftHtml/Tags/Cite.swift
@@ -12,5 +12,5 @@
 /// The text in the `<cite>` element usually renders in italic.
 open class Cite: StandardTag {
     
-    override open class var name: String { .init(Cite.self) }
+    override open class var name: String { .init(describing: Cite.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Code.swift b/Sources/SwiftHtml/Tags/Code.swift
index e116554..c87ea1e 100644
--- a/Sources/SwiftHtml/Tags/Code.swift
+++ b/Sources/SwiftHtml/Tags/Code.swift
@@ -16,5 +16,5 @@
 /// - `<pre>`    Defines preformatted text
 open class Code: StandardTag {
     
-    override open class var name: String { .init(Code.self) }
+    override open class var name: String { .init(describing: Code.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Col.swift b/Sources/SwiftHtml/Tags/Col.swift
index 8abe598..6f81460 100644
--- a/Sources/SwiftHtml/Tags/Col.swift
+++ b/Sources/SwiftHtml/Tags/Col.swift
@@ -10,7 +10,7 @@
 /// The `<col>` tag is useful for applying styles to entire columns, instead of repeating the styles for each cell, for each row.
 open class Col: EmptyTag {
     
-    override open class var name: String { .init(Col.self) }
+    override open class var name: String { .init(describing: Col.self).lowercased() }
 }
 
 public extension Col {
diff --git a/Sources/SwiftHtml/Tags/Colgroup.swift b/Sources/SwiftHtml/Tags/Colgroup.swift
index b6140a1..f650119 100644
--- a/Sources/SwiftHtml/Tags/Colgroup.swift
+++ b/Sources/SwiftHtml/Tags/Colgroup.swift
@@ -14,7 +14,7 @@
 /// **Tip:** To define different properties to a column within a `<colgroup>`, use the `<col>` tag within the `<colgroup>` tag.
 open class Colgroup: StandardTag {
     
-    override open class var name: String { .init(Colgroup.self) }
+    override open class var name: String { .init(describing: Colgroup.self).lowercased() }
 }
 
 public extension Colgroup {
diff --git a/Sources/SwiftHtml/Tags/Comment.swift b/Sources/SwiftHtml/Tags/Comment.swift
index a44eeeb..6bfae51 100644
--- a/Sources/SwiftHtml/Tags/Comment.swift
+++ b/Sources/SwiftHtml/Tags/Comment.swift
@@ -14,7 +14,7 @@
 /// This is especially useful if you have a lot of code.
 open class Comment: CommentTag {
     
-    override open class var name: String { .init(Comment.self) }
+    override open class var name: String { .init(describing: Comment.self).lowercased() }
     
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Data.swift b/Sources/SwiftHtml/Tags/Data.swift
index e8cd289..f231058 100644
--- a/Sources/SwiftHtml/Tags/Data.swift
+++ b/Sources/SwiftHtml/Tags/Data.swift
@@ -12,7 +12,7 @@
 /// **Tip:** If the content is time- or date-related, use the `<time>` element instead.
 open class Data: StandardTag {
     
-    override open class var name: String { .init(Data.self) }
+    override open class var name: String { .init(describing: Data.self).lowercased() }
 }
 
 public extension Data {
diff --git a/Sources/SwiftHtml/Tags/Datalist.swift b/Sources/SwiftHtml/Tags/Datalist.swift
index c8fc437..7d76c41 100644
--- a/Sources/SwiftHtml/Tags/Datalist.swift
+++ b/Sources/SwiftHtml/Tags/Datalist.swift
@@ -12,5 +12,5 @@
 /// The `<datalist>` element's id attribute must be equal to the `<input>` element's list attribute (this binds them together).
 open class Datalist: StandardTag {
     
-    override open class var name: String { .init(Datalist.self) }
+    override open class var name: String { .init(describing: Datalist.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Dd.swift b/Sources/SwiftHtml/Tags/Dd.swift
index 6dca905..8d7bc9e 100644
--- a/Sources/SwiftHtml/Tags/Dd.swift
+++ b/Sources/SwiftHtml/Tags/Dd.swift
@@ -12,5 +12,5 @@
 /// Inside a `<dd>` tag you can put paragraphs, line breaks, images, links, lists, etc.
 open class Dd: StandardTag {
     
-    override open class var name: String { .init(Dd.self) }
+    override open class var name: String { .init(describing: Dd.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Del.swift b/Sources/SwiftHtml/Tags/Del.swift
index 74de00c..ac3e11d 100644
--- a/Sources/SwiftHtml/Tags/Del.swift
+++ b/Sources/SwiftHtml/Tags/Del.swift
@@ -10,7 +10,7 @@
 /// Browsers will usually strike a line through deleted text.
 open class Del: StandardTag {
     
-    override open class var name: String { .init(Del.self) }
+    override open class var name: String { .init(describing: Del.self).lowercased() }
 }
 
 public extension Del {
diff --git a/Sources/SwiftHtml/Tags/Details.swift b/Sources/SwiftHtml/Tags/Details.swift
index 1b532ca..771afca 100644
--- a/Sources/SwiftHtml/Tags/Details.swift
+++ b/Sources/SwiftHtml/Tags/Details.swift
@@ -14,7 +14,7 @@
 /// **Tip:** The `<summary>` tag is used in conjuction with `<details>` to specify a visible heading for the details.
 open class Details: StandardTag {
     
-    override open class var name: String { .init(Details.self) }
+    override open class var name: String { .init(describing: Details.self).lowercased() }
 }
 
 public extension Details {
diff --git a/Sources/SwiftHtml/Tags/Dfn.swift b/Sources/SwiftHtml/Tags/Dfn.swift
index e8ec7dc..41d558e 100644
--- a/Sources/SwiftHtml/Tags/Dfn.swift
+++ b/Sources/SwiftHtml/Tags/Dfn.swift
@@ -13,5 +13,5 @@
 /// `<p><dfn>HTML</dfn> is the standard markup language for creating web pages.</p>`
 open class Dfn: StandardTag {
     
-    override open class var name: String { .init(Dfn.self) }
+    override open class var name: String { .init(describing: Dfn.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Dialog.swift b/Sources/SwiftHtml/Tags/Dialog.swift
index 4fda5c3..abd8ca2 100644
--- a/Sources/SwiftHtml/Tags/Dialog.swift
+++ b/Sources/SwiftHtml/Tags/Dialog.swift
@@ -10,7 +10,7 @@
 /// The `<dialog>` element makes it easy to create popup dialogs and modals on a web page.
 open class Dialog: StandardTag {
     
-    override open class var name: String { .init(Dialog.self) }
+    override open class var name: String { .init(describing: Dialog.self).lowercased() }
 }
 
 public extension Dialog {
diff --git a/Sources/SwiftHtml/Tags/Div.swift b/Sources/SwiftHtml/Tags/Div.swift
index fbeaf70..4c129e8 100644
--- a/Sources/SwiftHtml/Tags/Div.swift
+++ b/Sources/SwiftHtml/Tags/Div.swift
@@ -16,7 +16,7 @@
 /// **Note:** By default, browsers always place a line break before and after the `<div>` element.
 open class Div: StandardTag {
     
-    override open class var name: String { .init(Div.self) }
+    override open class var name: String { .init(describing: Div.self).lowercased() }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Dl.swift b/Sources/SwiftHtml/Tags/Dl.swift
index 23a264f..ab1d685 100644
--- a/Sources/SwiftHtml/Tags/Dl.swift
+++ b/Sources/SwiftHtml/Tags/Dl.swift
@@ -10,5 +10,5 @@
 /// The `<dl>` tag is used in conjunction with `<dt>` (defines terms/names) and `<dd>` (describes each term/name).
 open class Dl: StandardTag {
     
-    override open class var name: String { .init(Dl.self) }
+    override open class var name: String { .init(describing: Dl.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Dt.swift b/Sources/SwiftHtml/Tags/Dt.swift
index e40ab83..76812f1 100644
--- a/Sources/SwiftHtml/Tags/Dt.swift
+++ b/Sources/SwiftHtml/Tags/Dt.swift
@@ -10,5 +10,5 @@
 /// The `<dt>` tag is used in conjunction with `<dl>` (defines a description list) and `<dd>` (describes each term/name).
 open class Dt: StandardTag {
     
-    override open class var name: String { .init(Dt.self) }
+    override open class var name: String { .init(describing: Dt.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Em.swift b/Sources/SwiftHtml/Tags/Em.swift
index 88ccfb5..f40669b 100644
--- a/Sources/SwiftHtml/Tags/Em.swift
+++ b/Sources/SwiftHtml/Tags/Em.swift
@@ -10,5 +10,5 @@
 /// A screen reader will pronounce the words in `<em>` with an emphasis, using verbal stress.
 open class Em: StandardTag {
     
-    override open class var name: String { .init(Em.self) }
+    override open class var name: String { .init(describing: Em.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Embed.swift b/Sources/SwiftHtml/Tags/Embed.swift
index 87366ee..33fffea 100644
--- a/Sources/SwiftHtml/Tags/Embed.swift
+++ b/Sources/SwiftHtml/Tags/Embed.swift
@@ -8,7 +8,7 @@
 /// The `<embed>` tag defines a container for an external resource, such as a web page, a picture, a media player, or a plug-in application.
 open class Embed: EmptyTag {
     
-    override open class var name: String { .init(Embed.self) }
+    override open class var name: String { .init(describing: Embed.self).lowercased() }
 }
 
 public extension Embed {
diff --git a/Sources/SwiftHtml/Tags/Fieldset.swift b/Sources/SwiftHtml/Tags/Fieldset.swift
index 3fa2c3c..63976f0 100644
--- a/Sources/SwiftHtml/Tags/Fieldset.swift
+++ b/Sources/SwiftHtml/Tags/Fieldset.swift
@@ -10,7 +10,7 @@
 /// The `<fieldset>` tag draws a box around the related elements.
 open class Fieldset: StandardTag {
     
-    override open class var name: String { .init(Fieldset.self) }
+    override open class var name: String { .init(describing: Fieldset.self).lowercased() }
 }
 
 public extension Fieldset {
diff --git a/Sources/SwiftHtml/Tags/Figcaption.swift b/Sources/SwiftHtml/Tags/Figcaption.swift
index d0b9582..a1504fe 100644
--- a/Sources/SwiftHtml/Tags/Figcaption.swift
+++ b/Sources/SwiftHtml/Tags/Figcaption.swift
@@ -10,5 +10,5 @@
 /// The `<figcaption>` element can be placed as the first or last child of the `<figure>` element.
 open class Figcaption: StandardTag {
     
-    override open class var name: String { .init(Figcaption.self) }
+    override open class var name: String { .init(describing: Figcaption.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Figure.swift b/Sources/SwiftHtml/Tags/Figure.swift
index 9e499f6..cadeeae 100644
--- a/Sources/SwiftHtml/Tags/Figure.swift
+++ b/Sources/SwiftHtml/Tags/Figure.swift
@@ -12,6 +12,6 @@
 /// **Tip:** The `<figcaption>` element is used to add a caption for the `<figure>` element.
 open class Figure: StandardTag {
     
-    override open class var name: String { .init(Figure.self) }
+    override open class var name: String { .init(describing: Figure.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Footer.swift b/Sources/SwiftHtml/Tags/Footer.swift
index d9af9fd..d3acd7c 100644
--- a/Sources/SwiftHtml/Tags/Footer.swift
+++ b/Sources/SwiftHtml/Tags/Footer.swift
@@ -18,5 +18,5 @@
 /// You can have several `<footer>` elements in one document.
 open class Footer: StandardTag {
     
-    override open class var name: String { .init(Footer.self) }
+    override open class var name: String { .init(describing: Footer.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Form.swift b/Sources/SwiftHtml/Tags/Form.swift
index 1d6f60b..55fd824 100644
--- a/Sources/SwiftHtml/Tags/Form.swift
+++ b/Sources/SwiftHtml/Tags/Form.swift
@@ -20,7 +20,7 @@
 /// - `<output>`
 open class Form: StandardTag {
     
-    override open class var name: String { .init(Form.self) }
+    override open class var name: String { .init(describing: Form.self).lowercased() }
 }
 
 public extension Form {
diff --git a/Sources/SwiftHtml/Tags/H1.swift b/Sources/SwiftHtml/Tags/H1.swift
index 02fffe9..8f21bb4 100644
--- a/Sources/SwiftHtml/Tags/H1.swift
+++ b/Sources/SwiftHtml/Tags/H1.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H1: StandardTag {
     
-    override open class var name: String { .init(H1.self) }
+    override open class var name: String { .init(describing: H1.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H2.swift b/Sources/SwiftHtml/Tags/H2.swift
index 1e67cc3..e9c4934 100644
--- a/Sources/SwiftHtml/Tags/H2.swift
+++ b/Sources/SwiftHtml/Tags/H2.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H2: StandardTag {
     
-    override open class var name: String { .init(H2.self) }
+    override open class var name: String { .init(describing: H2.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H3.swift b/Sources/SwiftHtml/Tags/H3.swift
index 8e3e911..b38d006 100644
--- a/Sources/SwiftHtml/Tags/H3.swift
+++ b/Sources/SwiftHtml/Tags/H3.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H3: StandardTag {
     
-    override open class var name: String { .init(H3.self) }
+    override open class var name: String { .init(describing: H3.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H4.swift b/Sources/SwiftHtml/Tags/H4.swift
index a28935a..2cf3b66 100644
--- a/Sources/SwiftHtml/Tags/H4.swift
+++ b/Sources/SwiftHtml/Tags/H4.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H4: StandardTag {
     
-    override open class var name: String { .init(H4.self) }
+    override open class var name: String { .init(describing: H4.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H5.swift b/Sources/SwiftHtml/Tags/H5.swift
index 13596a7..fb5fb92 100644
--- a/Sources/SwiftHtml/Tags/H5.swift
+++ b/Sources/SwiftHtml/Tags/H5.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H5: StandardTag {
     
-    override open class var name: String { .init(H5.self) }
+    override open class var name: String { .init(describing: H5.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/H6.swift b/Sources/SwiftHtml/Tags/H6.swift
index f1e28ea..7ba4f95 100644
--- a/Sources/SwiftHtml/Tags/H6.swift
+++ b/Sources/SwiftHtml/Tags/H6.swift
@@ -13,5 +13,5 @@
 /// Also, do not skip heading levels - start with `<h1>`, then use `<h2>`, and so on.
 open class H6: StandardTag {
     
-    override open class var name: String { .init(H6.self) }
+    override open class var name: String { .init(describing: H6.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index ecba7f1..f451120 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -22,7 +22,7 @@
 /// - `<noscript>`
 open class Head: StandardTag {
     
-    override open class var name: String { .init(Head.self) }
+    override open class var name: String { .init(describing: Head.self).lowercased() }
     
     public private(set) var title: Title?
     public private(set) var styles: [Style]?
diff --git a/Sources/SwiftHtml/Tags/Header.swift b/Sources/SwiftHtml/Tags/Header.swift
index c493e39..de79b24 100644
--- a/Sources/SwiftHtml/Tags/Header.swift
+++ b/Sources/SwiftHtml/Tags/Header.swift
@@ -15,6 +15,6 @@
 /// **Note:** You can have several` <header>` elements in one HTML document. However,` <header>` cannot be placed within a` <footer>`,` <address>` or another` <header>` element.
 open class Header: StandardTag {
     
-    override open class var name: String { .init(Header.self) }
+    override open class var name: String { .init(describing: Header.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Hr.swift b/Sources/SwiftHtml/Tags/Hr.swift
index 8f9e65e..091855c 100644
--- a/Sources/SwiftHtml/Tags/Hr.swift
+++ b/Sources/SwiftHtml/Tags/Hr.swift
@@ -10,5 +10,5 @@
 /// The `<hr>` element is most often displayed as a horizontal rule that is used to separate content (or define a change) in an HTML page.
 open class Hr: EmptyTag {
     
-    override open class var name: String { .init(Hr.self) }
+    override open class var name: String { .init(describing: Hr.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 3922c41..148f7f4 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -12,7 +12,7 @@
 /// **Note:** You should always include the lang attribute inside the `<html>` tag, to declare the language of the Web page. This is meant to assist search engines and browsers.
 open class Html: StandardTag {
     
-    override open class var name: String { .init(Html.self) }
+    override open class var name: String { .init(describing: Html.self).lowercased() }
 }
 
 public extension Html {
diff --git a/Sources/SwiftHtml/Tags/I.swift b/Sources/SwiftHtml/Tags/I.swift
index 3d870b6..b4a8dd0 100644
--- a/Sources/SwiftHtml/Tags/I.swift
+++ b/Sources/SwiftHtml/Tags/I.swift
@@ -18,5 +18,5 @@
 /// - `<dfn>` (a definition term)
 open class I: StandardTag {
     
-    override open class var name: String { .init(I.self) }
+    override open class var name: String { .init(describing: I.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Iframe.swift b/Sources/SwiftHtml/Tags/Iframe.swift
index 155c2a7..7a1a64f 100644
--- a/Sources/SwiftHtml/Tags/Iframe.swift
+++ b/Sources/SwiftHtml/Tags/Iframe.swift
@@ -14,7 +14,7 @@
 /// **Tip:** It is a good practice to always include a title attribute for the `<iframe>`. This is used by screen readers to read out what the content of the `<iframe>` is.
 open class Iframe: StandardTag {
     
-    override open class var name: String { .init(Iframe.self) }
+    override open class var name: String { .init(describing: Iframe.self).lowercased() }
 }
 
 public extension Iframe {
diff --git a/Sources/SwiftHtml/Tags/Img.swift b/Sources/SwiftHtml/Tags/Img.swift
index 6306c6a..62e5480 100644
--- a/Sources/SwiftHtml/Tags/Img.swift
+++ b/Sources/SwiftHtml/Tags/Img.swift
@@ -20,7 +20,7 @@
 /// **Tip:** To link an image to another document, simply nest the `<img>` tag inside an `<a>` tag (see example below).
 open class Img: EmptyTag {
     
-    override open class var name: String { .init(Img.self) }
+    override open class var name: String { .init(describing: Img.self).lowercased() }
     
     public init(src: String, alt: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Input.swift b/Sources/SwiftHtml/Tags/Input.swift
index 691628d..fadf938 100644
--- a/Sources/SwiftHtml/Tags/Input.swift
+++ b/Sources/SwiftHtml/Tags/Input.swift
@@ -12,7 +12,7 @@
 /// The `<input>` element can be displayed in several ways, depending on the type attribute.
 open class Input: EmptyTag {
     
-    override open class var name: String { .init(Input.self) }
+    override open class var name: String { .init(describing: Input.self).lowercased() }
 }
 
 public extension Input {
diff --git a/Sources/SwiftHtml/Tags/Ins.swift b/Sources/SwiftHtml/Tags/Ins.swift
index 21a32fd..903b493 100644
--- a/Sources/SwiftHtml/Tags/Ins.swift
+++ b/Sources/SwiftHtml/Tags/Ins.swift
@@ -10,5 +10,5 @@
 /// **Tip:** Also look at the `<del>` tag to markup deleted text.
 open class Ins: StandardTag {
     
-    override open class var name: String { .init(Ins.self) }
+    override open class var name: String { .init(describing: Ins.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Kbd.swift b/Sources/SwiftHtml/Tags/Kbd.swift
index aa30015..3fe1940 100644
--- a/Sources/SwiftHtml/Tags/Kbd.swift
+++ b/Sources/SwiftHtml/Tags/Kbd.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS (see example below).
 open class Kbd: StandardTag {
     
-    override open class var name: String { .init(Kbd.self) }
+    override open class var name: String { .init(describing: Kbd.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Label.swift b/Sources/SwiftHtml/Tags/Label.swift
index 738f1fc..ba5255c 100644
--- a/Sources/SwiftHtml/Tags/Label.swift
+++ b/Sources/SwiftHtml/Tags/Label.swift
@@ -35,7 +35,7 @@
 /// Users who have difficulty clicking on very small regions (such as checkboxes) - because when a user clicks the text within the `<label>` element, it toggles the input (this increases the hit area).
 open class Label: StandardTag {
     
-    override open class var name: String { .init(Label.self) }
+    override open class var name: String { .init(describing: Label.self).lowercased() }
 }
 
 public extension Label {
diff --git a/Sources/SwiftHtml/Tags/Legend.swift b/Sources/SwiftHtml/Tags/Legend.swift
index ede96b4..063e715 100644
--- a/Sources/SwiftHtml/Tags/Legend.swift
+++ b/Sources/SwiftHtml/Tags/Legend.swift
@@ -8,5 +8,5 @@
 /// The `<legend>` tag defines a caption for the `<fieldset>` element.
 open class Legend: StandardTag {
     
-    override open class var name: String { .init(Legend.self) }
+    override open class var name: String { .init(describing: Legend.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Li.swift b/Sources/SwiftHtml/Tags/Li.swift
index e9d3aea..c8959dc 100644
--- a/Sources/SwiftHtml/Tags/Li.swift
+++ b/Sources/SwiftHtml/Tags/Li.swift
@@ -16,7 +16,7 @@
 /// **Tip:** Use CSS to style lists.
 open class Li: StandardTag {
     
-    override open class var name: String { .init(Li.self) }
+    override open class var name: String { .init(describing: Li.self).lowercased() }
 }
 
 public extension Li {
diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index aa94b3a..d65c174 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -12,7 +12,7 @@
 /// The `<link>` element is an empty element, it contains attributes only.
 open class Link: EmptyTag {
     
-    override open class var name: String { .init(Link.self) }
+    override open class var name: String { .init(describing: Link.self).lowercased() }
     
     public init(rel: Rel) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/MainTag.swift b/Sources/SwiftHtml/Tags/MainTag.swift
index aeb8178..da27bd0 100644
--- a/Sources/SwiftHtml/Tags/MainTag.swift
+++ b/Sources/SwiftHtml/Tags/MainTag.swift
@@ -12,7 +12,7 @@
 /// **Note:** There must not be more than one `<main>` element in a document. The `<main>` element must NOT be a descendant of an `<article>`, `<aside>`, `<footer>`, `<header>`, or `<nav>` element.
 open class Main: StandardTag {
     
-    override open class var name: String { .init(Main.self) }
+    override open class var name: String { .init(describing: Main.self).lowercased() }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Map.swift b/Sources/SwiftHtml/Tags/Map.swift
index 8aa8483..ae02f3c 100644
--- a/Sources/SwiftHtml/Tags/Map.swift
+++ b/Sources/SwiftHtml/Tags/Map.swift
@@ -12,7 +12,7 @@
 /// The `<map>` element contains a number of `<area>` elements, that defines the clickable areas in the image map.
 open class Map: StandardTag {
     
-    override open class var name: String { .init(Map.self) }
+    override open class var name: String { .init(describing: Map.self).lowercased() }
         
     public init(name: String, @TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
diff --git a/Sources/SwiftHtml/Tags/Mark.swift b/Sources/SwiftHtml/Tags/Mark.swift
index 6f26d13..7430fe2 100644
--- a/Sources/SwiftHtml/Tags/Mark.swift
+++ b/Sources/SwiftHtml/Tags/Mark.swift
@@ -8,5 +8,5 @@
 /// The `<mark>` tag defines text that should be marked or highlighted.
 open class Mark: StandardTag {
     
-    override open class var name: String { .init(Mark.self) }
+    override open class var name: String { .init(describing: Mark.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Meta.swift b/Sources/SwiftHtml/Tags/Meta.swift
index 52e14ae..0b576c2 100644
--- a/Sources/SwiftHtml/Tags/Meta.swift
+++ b/Sources/SwiftHtml/Tags/Meta.swift
@@ -16,7 +16,7 @@
 /// There is a method to let web designers take control over the viewport (the user's visible area of a web page), through the `<meta>` tag (See "Setting The Viewport" example below).
 open class Meta: EmptyTag {
     
-    override open class var name: String { .init(Meta.self) }
+    override open class var name: String { .init(describing: Meta.self).lowercased() }
 }
 
 public extension Meta {
diff --git a/Sources/SwiftHtml/Tags/Meter.swift b/Sources/SwiftHtml/Tags/Meter.swift
index da980b9..c0706dc 100644
--- a/Sources/SwiftHtml/Tags/Meter.swift
+++ b/Sources/SwiftHtml/Tags/Meter.swift
@@ -14,7 +14,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Meter: StandardTag {
     
-    override open class var name: String { .init(Meter.self) }
+    override open class var name: String { .init(describing: Meter.self).lowercased() }
     
     public init(value: Int, _ contents: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/Nav.swift b/Sources/SwiftHtml/Tags/Nav.swift
index e5a9d80..ee67968 100644
--- a/Sources/SwiftHtml/Tags/Nav.swift
+++ b/Sources/SwiftHtml/Tags/Nav.swift
@@ -12,7 +12,7 @@
 /// Browsers, such as screen readers for disabled users, can use this element to determine whether to omit the initial rendering of this content.
 open class Nav: StandardTag {
     
-    override open class var name: String { .init(Nav.self) }
+    override open class var name: String { .init(describing: Nav.self).lowercased() }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Noscript.swift b/Sources/SwiftHtml/Tags/Noscript.swift
index d4e6996..afba638 100644
--- a/Sources/SwiftHtml/Tags/Noscript.swift
+++ b/Sources/SwiftHtml/Tags/Noscript.swift
@@ -10,5 +10,5 @@
 /// The `<noscript>` element can be used in both `<head>` and `<body>`. When used inside `<head>`, the `<noscript>` element could only contain `<link>`, `<style>`, and `<meta>` elements.
 open class Noscript: StandardTag {
     
-    override open class var name: String { .init(Noscript.self) }
+    override open class var name: String { .init(describing: Noscript.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Object.swift b/Sources/SwiftHtml/Tags/Object.swift
index db4a762..17b5f78 100644
--- a/Sources/SwiftHtml/Tags/Object.swift
+++ b/Sources/SwiftHtml/Tags/Object.swift
@@ -10,7 +10,7 @@
 /// The external resource can be a web page, a picture, a media player, or a plug-in application.
 open class Object: StandardTag {
     
-    override open class var name: String { .init(Object.self) }
+    override open class var name: String { .init(describing: Object.self).lowercased() }
 }
 
 public extension Object {
diff --git a/Sources/SwiftHtml/Tags/Ol.swift b/Sources/SwiftHtml/Tags/Ol.swift
index 192f175..2f6897e 100644
--- a/Sources/SwiftHtml/Tags/Ol.swift
+++ b/Sources/SwiftHtml/Tags/Ol.swift
@@ -14,7 +14,7 @@
 /// **Tip:** For unordered list, use the `<ul>` tag.
 open class Ol: StandardTag {
     
-    override open class var name: String { .init(Ol.self) }
+    override open class var name: String { .init(describing: Ol.self).lowercased() }
 }
 
 public extension Ol {
diff --git a/Sources/SwiftHtml/Tags/Optgroup.swift b/Sources/SwiftHtml/Tags/Optgroup.swift
index 45dfee8..703d91b 100644
--- a/Sources/SwiftHtml/Tags/Optgroup.swift
+++ b/Sources/SwiftHtml/Tags/Optgroup.swift
@@ -10,7 +10,7 @@
 /// If you have a long list of options, groups of related options are easier to handle for a user.
 open class Optgroup: StandardTag {
     
-    override open class var name: String { .init(Optgroup.self) }
+    override open class var name: String { .init(describing: Optgroup.self).lowercased() }
 }
 
 public extension Optgroup {
diff --git a/Sources/SwiftHtml/Tags/Option.swift b/Sources/SwiftHtml/Tags/Option.swift
index 06e7470..892d1f0 100644
--- a/Sources/SwiftHtml/Tags/Option.swift
+++ b/Sources/SwiftHtml/Tags/Option.swift
@@ -14,7 +14,7 @@
 /// **Tip:** If you have a long list of options, you can group related options within the `<optgroup>` tag.
 open class Option: StandardTag {
     
-    override open class var name: String { .init(Option.self) }
+    override open class var name: String { .init(describing: Option.self).lowercased() }
 }
 
 public extension Option {
diff --git a/Sources/SwiftHtml/Tags/Output.swift b/Sources/SwiftHtml/Tags/Output.swift
index 67fcb68..9d45185 100644
--- a/Sources/SwiftHtml/Tags/Output.swift
+++ b/Sources/SwiftHtml/Tags/Output.swift
@@ -8,7 +8,7 @@
 /// The `<output>` tag is used to represent the result of a calculation (like one performed by a script).
 open class Output: StandardTag {
     
-    override open class var name: String { .init(Output.self) }
+    override open class var name: String { .init(describing: Output.self).lowercased() }
 }
 
 public extension Output {
diff --git a/Sources/SwiftHtml/Tags/P.swift b/Sources/SwiftHtml/Tags/P.swift
index 7c3b0be..a7e6021 100644
--- a/Sources/SwiftHtml/Tags/P.swift
+++ b/Sources/SwiftHtml/Tags/P.swift
@@ -12,5 +12,5 @@
 /// **Tip:** Use CSS to style paragraphs.
 open class P: StandardTag {
     
-    override open class var name: String { .init(P.self) }
+    override open class var name: String { .init(describing: P.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Param.swift b/Sources/SwiftHtml/Tags/Param.swift
index 103728c..80c14ac 100644
--- a/Sources/SwiftHtml/Tags/Param.swift
+++ b/Sources/SwiftHtml/Tags/Param.swift
@@ -8,7 +8,7 @@
 /// The `<param>` tag is used to define parameters for an `<object>` element.
 open class Param: EmptyTag {
     
-    override open class var name: String { .init(Param.self) }
+    override open class var name: String { .init(describing: Param.self).lowercased() }
 }
 
 public extension Param {
diff --git a/Sources/SwiftHtml/Tags/Picture.swift b/Sources/SwiftHtml/Tags/Picture.swift
index fe4c6c9..cf0f633 100644
--- a/Sources/SwiftHtml/Tags/Picture.swift
+++ b/Sources/SwiftHtml/Tags/Picture.swift
@@ -18,5 +18,5 @@
 /// **Tip:** The `<picture>` element works "similar" to `<video>` and `<audio>`. You set up different sources, and the first source that fits the preferences is the one being used.
 open class Picture: StandardTag {
     
-    override open class var name: String { .init(Picture.self) }
+    override open class var name: String { .init(describing: Picture.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Pre.swift b/Sources/SwiftHtml/Tags/Pre.swift
index 5c43636..4f3563e 100644
--- a/Sources/SwiftHtml/Tags/Pre.swift
+++ b/Sources/SwiftHtml/Tags/Pre.swift
@@ -11,5 +11,5 @@
 /// The text will be displayed exactly as written in the HTML source code.
 open class Pre: StandardTag {
     
-    override open class var name: String { .init(Pre.self) }
+    override open class var name: String { .init(describing: Pre.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Progress.swift b/Sources/SwiftHtml/Tags/Progress.swift
index 917b461..8f3b5b8 100644
--- a/Sources/SwiftHtml/Tags/Progress.swift
+++ b/Sources/SwiftHtml/Tags/Progress.swift
@@ -10,7 +10,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Progress: StandardTag {
     
-    override open class var name: String { .init(Progress.self) }
+    override open class var name: String { .init(describing: Progress.self).lowercased() }
 }
 
 public extension Progress {
diff --git a/Sources/SwiftHtml/Tags/Q.swift b/Sources/SwiftHtml/Tags/Q.swift
index 8087bdb..34e5f2a 100644
--- a/Sources/SwiftHtml/Tags/Q.swift
+++ b/Sources/SwiftHtml/Tags/Q.swift
@@ -12,7 +12,7 @@
 /// **Tip:** Use `<blockquote>` for long quotations.
 open class Q: StandardTag {
     
-    override open class var name: String { .init(Q.self) }
+    override open class var name: String { .init(describing: Q.self).lowercased() }
 }
 
 public extension Q {
diff --git a/Sources/SwiftHtml/Tags/Rp.swift b/Sources/SwiftHtml/Tags/Rp.swift
index 63d3ad8..e195d1a 100644
--- a/Sources/SwiftHtml/Tags/Rp.swift
+++ b/Sources/SwiftHtml/Tags/Rp.swift
@@ -10,5 +10,5 @@
 /// Use `<rp>` together with `<ruby>` and `<rt>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rp: StandardTag {
     
-    override open class var name: String { .init(Rp.self) }
+    override open class var name: String { .init(describing: Rp.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Rt.swift b/Sources/SwiftHtml/Tags/Rt.swift
index ba5ba65..7763328 100644
--- a/Sources/SwiftHtml/Tags/Rt.swift
+++ b/Sources/SwiftHtml/Tags/Rt.swift
@@ -10,5 +10,5 @@
 /// Use `<rt>` together with `<ruby>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that not support ruby annotations.
 open class Rt: StandardTag {
     
-    override open class var name: String { .init(Rt.self) }
+    override open class var name: String { .init(describing: Rt.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Ruby.swift b/Sources/SwiftHtml/Tags/Ruby.swift
index f3c2ff5..89a7f50 100644
--- a/Sources/SwiftHtml/Tags/Ruby.swift
+++ b/Sources/SwiftHtml/Tags/Ruby.swift
@@ -12,5 +12,5 @@
 /// Use `<ruby>` together with `<rt>` and `<rp>`: The `<ruby>` element consists of one or more characters that needs an explanation/pronunciation, and an `<rt>` element that gives that information, and an optional `<rp>` element that defines what to show for browsers that do not support ruby annotations.
 open class Ruby: StandardTag {
     
-    override open class var name: String { .init(Ruby.self) }
+    override open class var name: String { .init(describing: Ruby.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/S.swift b/Sources/SwiftHtml/Tags/S.swift
index 2a3f234..a41c6b5 100644
--- a/Sources/SwiftHtml/Tags/S.swift
+++ b/Sources/SwiftHtml/Tags/S.swift
@@ -10,5 +10,5 @@
 /// The `<s>` tag should not be used to define deleted text in a document, use the `<del>` tag for that.
 open class S: StandardTag {
     
-    override open class var name: String { .init(S.self) }
+    override open class var name: String { .init(describing: S.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Samp.swift b/Sources/SwiftHtml/Tags/Samp.swift
index c3d4c90..13be63b 100644
--- a/Sources/SwiftHtml/Tags/Samp.swift
+++ b/Sources/SwiftHtml/Tags/Samp.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Samp: StandardTag {
     
-    override open class var name: String { .init(Samp.self) }
+    override open class var name: String { .init(describing: Samp.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Script.swift b/Sources/SwiftHtml/Tags/Script.swift
index 2bd757a..8b026a3 100644
--- a/Sources/SwiftHtml/Tags/Script.swift
+++ b/Sources/SwiftHtml/Tags/Script.swift
@@ -12,7 +12,7 @@
 /// Common uses for JavaScript are image manipulation, form validation, and dynamic changes of content.
 open class Script: StandardTag {
     
-    override open class var name: String { .init(Script.self) }
+    override open class var name: String { .init(describing: Script.self).lowercased() }
     
     public enum `Type`: String {
         case javascript = "text/javascript"
diff --git a/Sources/SwiftHtml/Tags/Section.swift b/Sources/SwiftHtml/Tags/Section.swift
index e63c1e2..c40c4e4 100644
--- a/Sources/SwiftHtml/Tags/Section.swift
+++ b/Sources/SwiftHtml/Tags/Section.swift
@@ -8,5 +8,5 @@
 /// The `<section>` tag defines a section in a document.
 open class Section: StandardTag {
     
-    override open class var name: String { .init(Section.self) }
+    override open class var name: String { .init(describing: Section.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Select.swift b/Sources/SwiftHtml/Tags/Select.swift
index cfedecf..6e1c136 100644
--- a/Sources/SwiftHtml/Tags/Select.swift
+++ b/Sources/SwiftHtml/Tags/Select.swift
@@ -18,7 +18,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Select: StandardTag {
     
-    override open class var name: String { .init(Select.self) }
+    override open class var name: String { .init(describing: Select.self).lowercased() }
 }
 
 public extension Select {
diff --git a/Sources/SwiftHtml/Tags/Small.swift b/Sources/SwiftHtml/Tags/Small.swift
index c0b7a02..f311252 100644
--- a/Sources/SwiftHtml/Tags/Small.swift
+++ b/Sources/SwiftHtml/Tags/Small.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated, but it is possible to achieve richer (or the same) effect with CSS.
 open class Small: StandardTag {
     
-    override open class var name: String { .init(Small.self) }
+    override open class var name: String { .init(describing: Small.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Source.swift b/Sources/SwiftHtml/Tags/Source.swift
index 1e05cba..d2906d9 100644
--- a/Sources/SwiftHtml/Tags/Source.swift
+++ b/Sources/SwiftHtml/Tags/Source.swift
@@ -12,7 +12,7 @@
 /// The browser will choose the first `<source>` it supports.
 open class Source: EmptyTag {
     
-    override open class var name: String { .init(Source.self) }
+    override open class var name: String { .init(describing: Source.self).lowercased() }
 }
 
 public extension Source {
diff --git a/Sources/SwiftHtml/Tags/Span.swift b/Sources/SwiftHtml/Tags/Span.swift
index 70e226e..b4a28cc 100644
--- a/Sources/SwiftHtml/Tags/Span.swift
+++ b/Sources/SwiftHtml/Tags/Span.swift
@@ -12,5 +12,5 @@
 /// The `<span>` tag is much like the `<div>` element, but `<div>` is a block-level element and `<span>` is an inline element.
 open class Span: StandardTag {
     
-    override open class var name: String { .init(Span.self) }
+    override open class var name: String { .init(describing: Span.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Strong.swift b/Sources/SwiftHtml/Tags/Strong.swift
index 0d2a714..e2f7846 100644
--- a/Sources/SwiftHtml/Tags/Strong.swift
+++ b/Sources/SwiftHtml/Tags/Strong.swift
@@ -10,5 +10,5 @@
 /// **Tip:** Use the `<b>` tag to specify bold text without any extra importance!
 open class Strong: StandardTag {
     
-    override open class var name: String { .init(Strong.self) }
+    override open class var name: String { .init(describing: Strong.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Style.swift b/Sources/SwiftHtml/Tags/Style.swift
index 1750db3..18a0065 100644
--- a/Sources/SwiftHtml/Tags/Style.swift
+++ b/Sources/SwiftHtml/Tags/Style.swift
@@ -11,7 +11,7 @@
 /// Inside the `<style>` element you specify how HTML elements should render in a browser.
 open class Style: StandardTag {
     
-    override open class var name: String { .init(Style.self) }
+    override open class var name: String { .init(describing: Style.self).lowercased() }
 }
 
 public extension Style {
diff --git a/Sources/SwiftHtml/Tags/Sub.swift b/Sources/SwiftHtml/Tags/Sub.swift
index 71413e4..40ddfcd 100644
--- a/Sources/SwiftHtml/Tags/Sub.swift
+++ b/Sources/SwiftHtml/Tags/Sub.swift
@@ -13,5 +13,5 @@
 /// **Tip:** Use the `<sup>` tag to define superscripted text.
 open class Sub: StandardTag {
     
-    override open class var name: String { .init(Sub.self) }
+    override open class var name: String { .init(describing: Sub.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Summary.swift b/Sources/SwiftHtml/Tags/Summary.swift
index e1cfca1..041a516 100644
--- a/Sources/SwiftHtml/Tags/Summary.swift
+++ b/Sources/SwiftHtml/Tags/Summary.swift
@@ -10,5 +10,5 @@
 /// **Note:** The `<summary>` element should be the first child element of the `<details>` element.
 open class Summary: StandardTag {
     
-    override open class var name: String { .init(Summary.self) }
+    override open class var name: String { .init(describing: Summary.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Sup.swift b/Sources/SwiftHtml/Tags/Sup.swift
index 91982f8..92d6278 100644
--- a/Sources/SwiftHtml/Tags/Sup.swift
+++ b/Sources/SwiftHtml/Tags/Sup.swift
@@ -13,5 +13,5 @@
 /// **Tip:** Use the `<sub>` tag to define subscript text.
 open class Sup: StandardTag {
     
-    override open class var name: String { .init(Sup.self) }
+    override open class var name: String { .init(describing: Sup.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Table.swift b/Sources/SwiftHtml/Tags/Table.swift
index 4889371..4318863 100644
--- a/Sources/SwiftHtml/Tags/Table.swift
+++ b/Sources/SwiftHtml/Tags/Table.swift
@@ -14,5 +14,5 @@
 /// An HTML table may also include `<caption>`, `<colgroup>`, `<thead>`, `<tfoot>`, and `<tbody>` elements.
 open class Table: StandardTag {
     
-    override open class var name: String { .init(Table.self) }
+    override open class var name: String { .init(describing: Table.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Tbody.swift b/Sources/SwiftHtml/Tags/Tbody.swift
index 1781848..2fe72af 100644
--- a/Sources/SwiftHtml/Tags/Tbody.swift
+++ b/Sources/SwiftHtml/Tags/Tbody.swift
@@ -19,6 +19,6 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tbody: StandardTag {
     
-    override open class var name: String { .init(Tbody.self) }
+    override open class var name: String { .init(describing: Tbody.self).lowercased() }
 }
 
diff --git a/Sources/SwiftHtml/Tags/Td.swift b/Sources/SwiftHtml/Tags/Td.swift
index fe2f8db..a328ece 100644
--- a/Sources/SwiftHtml/Tags/Td.swift
+++ b/Sources/SwiftHtml/Tags/Td.swift
@@ -17,7 +17,7 @@
 /// The text in `<th>` elements are bold and centered by default.
 open class Td: StandardTag {
     
-    override open class var name: String { .init(Td.self) }
+    override open class var name: String { .init(describing: Td.self).lowercased() }
 }
 
 public extension Td {
diff --git a/Sources/SwiftHtml/Tags/Template.swift b/Sources/SwiftHtml/Tags/Template.swift
index 5ae1298..70e99af 100644
--- a/Sources/SwiftHtml/Tags/Template.swift
+++ b/Sources/SwiftHtml/Tags/Template.swift
@@ -13,7 +13,7 @@
 /// To do this without the `<template>` tag, you have to create the HTML code with JavaScript to prevent the browser from rendering the code.
 open class Template: StandardTag {
     
-    override open class var name: String { .init(Template.self) }
+    override open class var name: String { .init(describing: Template.self).lowercased() }
 }
 
 
diff --git a/Sources/SwiftHtml/Tags/Textarea.swift b/Sources/SwiftHtml/Tags/Textarea.swift
index 9731543..ba442f9 100644
--- a/Sources/SwiftHtml/Tags/Textarea.swift
+++ b/Sources/SwiftHtml/Tags/Textarea.swift
@@ -20,7 +20,7 @@
 /// **Tip:** Always add the `<label>` tag for best accessibility practices!
 open class Textarea: StandardTag {
     
-    override open class var name: String { .init(Textarea.self) }
+    override open class var name: String { .init(describing: Textarea.self).lowercased() }
 }
 
 public extension Textarea {
diff --git a/Sources/SwiftHtml/Tags/Tfoot.swift b/Sources/SwiftHtml/Tags/Tfoot.swift
index d28844c..7911f8c 100644
--- a/Sources/SwiftHtml/Tags/Tfoot.swift
+++ b/Sources/SwiftHtml/Tags/Tfoot.swift
@@ -19,5 +19,5 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Tfoot: StandardTag {
     
-    override open class var name: String { .init(Tfoot.self) }
+    override open class var name: String { .init(describing: Tfoot.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Th.swift b/Sources/SwiftHtml/Tags/Th.swift
index 4ca0a75..6cf68ea 100644
--- a/Sources/SwiftHtml/Tags/Th.swift
+++ b/Sources/SwiftHtml/Tags/Th.swift
@@ -17,7 +17,7 @@
 /// The text in `<td>` elements are regular and left-aligned by default.
 open class Th: StandardTag {
     
-    override open class var name: String { .init(Th.self) }
+    override open class var name: String { .init(describing: Th.self).lowercased() }
 }
 
 public extension Th {
diff --git a/Sources/SwiftHtml/Tags/Thead.swift b/Sources/SwiftHtml/Tags/Thead.swift
index 814838c..058f03e 100644
--- a/Sources/SwiftHtml/Tags/Thead.swift
+++ b/Sources/SwiftHtml/Tags/Thead.swift
@@ -19,5 +19,5 @@
 /// **Tip:** The `<thead>`, `<tbody>`, and `<tfoot>` elements will not affect the layout of the table by default. However, you can use CSS to style these elements (see example below)!
 open class Thead: StandardTag {
     
-    override open class var name: String { .init(Thead.self) }
+    override open class var name: String { .init(describing: Thead.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Time.swift b/Sources/SwiftHtml/Tags/Time.swift
index b101f86..95dcb3d 100644
--- a/Sources/SwiftHtml/Tags/Time.swift
+++ b/Sources/SwiftHtml/Tags/Time.swift
@@ -10,7 +10,7 @@
 /// The datetime attribute of this element is used translate the time into a machine-readable format so that browsers can offer to add date reminders through the user's calendar, and search engines can produce smarter search results.
 open class Time: StandardTag {
     
-    override open class var name: String { .init(Time.self) }
+    override open class var name: String { .init(describing: Time.self).lowercased() }
 }
 
 public extension Time {
diff --git a/Sources/SwiftHtml/Tags/Title.swift b/Sources/SwiftHtml/Tags/Title.swift
index bcb245b..2d129fe 100644
--- a/Sources/SwiftHtml/Tags/Title.swift
+++ b/Sources/SwiftHtml/Tags/Title.swift
@@ -28,5 +28,5 @@
 /// **Note:** You can NOT have more than one `<title>` element in an HTML document.
 open class Title: StandardTag {
     
-    override open class var name: String { .init(Title.self) }
+    override open class var name: String { .init(describing: Title.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Tr.swift b/Sources/SwiftHtml/Tags/Tr.swift
index bda4d9a..21603a3 100644
--- a/Sources/SwiftHtml/Tags/Tr.swift
+++ b/Sources/SwiftHtml/Tags/Tr.swift
@@ -10,5 +10,5 @@
 /// A `<tr>` element contains one or more `<th>` or `<td>` elements.
 open class Tr: StandardTag {
     
-    override open class var name: String { .init(Tr.self) }
+    override open class var name: String { .init(describing: Tr.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Track.swift b/Sources/SwiftHtml/Tags/Track.swift
index 782b5b8..b288cee 100644
--- a/Sources/SwiftHtml/Tags/Track.swift
+++ b/Sources/SwiftHtml/Tags/Track.swift
@@ -12,7 +12,7 @@
 /// Tracks are formatted in WebVTT format (.vtt files).
 open class Track: EmptyTag {
     
-    override open class var name: String { .init(Track.self) }
+    override open class var name: String { .init(describing: Track.self).lowercased() }
     
     public init(src: String) {
         super.init()
diff --git a/Sources/SwiftHtml/Tags/U.swift b/Sources/SwiftHtml/Tags/U.swift
index ed4138e..aba93f5 100644
--- a/Sources/SwiftHtml/Tags/U.swift
+++ b/Sources/SwiftHtml/Tags/U.swift
@@ -13,5 +13,5 @@
 /// **Tip:** Avoid using the `<u>` element where it could be confused for a hyperlink!
 open class U: StandardTag {
     
-    override open class var name: String { .init(U.self) }
+    override open class var name: String { .init(describing: U.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Ul.swift b/Sources/SwiftHtml/Tags/Ul.swift
index b0d0e44..7ff907a 100644
--- a/Sources/SwiftHtml/Tags/Ul.swift
+++ b/Sources/SwiftHtml/Tags/Ul.swift
@@ -14,5 +14,5 @@
 /// **Tip:** For ordered lists, use the `<ol>` tag.
 open class Ul: StandardTag {
     
-    override open class var name: String { .init(Ul.self) }
+    override open class var name: String { .init(describing: Ul.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Var.swift b/Sources/SwiftHtml/Tags/Var.swift
index 321a5fc..700a36e 100644
--- a/Sources/SwiftHtml/Tags/Var.swift
+++ b/Sources/SwiftHtml/Tags/Var.swift
@@ -10,5 +10,5 @@
 /// **Tip:** This tag is not deprecated. However, it is possible to achieve richer effect by using CSS.
 open class Var: StandardTag {
     
-    override open class var name: String { .init(Var.self) }
+    override open class var name: String { .init(describing: Var.self).lowercased() }
 }
diff --git a/Sources/SwiftHtml/Tags/Video.swift b/Sources/SwiftHtml/Tags/Video.swift
index fdcd73c..d85e5ed 100644
--- a/Sources/SwiftHtml/Tags/Video.swift
+++ b/Sources/SwiftHtml/Tags/Video.swift
@@ -22,7 +22,7 @@
 ///     Opera   | YES | YES  | YES
 open class Video: StandardTag {
     
-    override open class var name: String { .init(Video.self) }
+    override open class var name: String { .init(describing: Video.self).lowercased() }
 }
 
 public extension Video {
diff --git a/Sources/SwiftHtml/Tags/Wbr.swift b/Sources/SwiftHtml/Tags/Wbr.swift
index 49a67b9..8bcd498 100644
--- a/Sources/SwiftHtml/Tags/Wbr.swift
+++ b/Sources/SwiftHtml/Tags/Wbr.swift
@@ -10,5 +10,5 @@
 /// **Tip:** When a word is too long, the browser might break it at the wrong place. You can use the `<wbr>` element to add word break opportunities.
 open class Wbr: StandardTag {
     
-    override open class var name: String { .init(Wbr.self) }
+    override open class var name: String { .init(describing: Wbr.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Channel.swift b/Sources/SwiftRss/Channel.swift
index 3ef59b7..f6723d3 100644
--- a/Sources/SwiftRss/Channel.swift
+++ b/Sources/SwiftRss/Channel.swift
@@ -7,5 +7,5 @@
 
 public class Channel: StandardTag {
     
-    override open class var name: String { .init(Channel.self) }
+    override open class var name: String { .init(describing: Channel.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Description.swift b/Sources/SwiftRss/Description.swift
index c92abb0..9db38ca 100644
--- a/Sources/SwiftRss/Description.swift
+++ b/Sources/SwiftRss/Description.swift
@@ -7,7 +7,7 @@
 
 open class Description: StandardTag {
     
-    override open class var name: String { .init(Description.self) }
+    override open class var name: String { .init(describing: Description.self).lowercased() }
     
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftRss/Guid.swift b/Sources/SwiftRss/Guid.swift
index f081dce..85ebdb7 100644
--- a/Sources/SwiftRss/Guid.swift
+++ b/Sources/SwiftRss/Guid.swift
@@ -7,7 +7,7 @@
 
 open class Guid: StandardTag {
     
-    override open class var name: String { .init(Guid.self) }
+    override open class var name: String { .init(describing: Guid.self).lowercased() }
 
 }
 
diff --git a/Sources/SwiftRss/Item.swift b/Sources/SwiftRss/Item.swift
index f645792..d43c7a9 100644
--- a/Sources/SwiftRss/Item.swift
+++ b/Sources/SwiftRss/Item.swift
@@ -8,5 +8,5 @@
 
 public class Item: StandardTag {
     
-    override open class var name: String { .init(Item.self) }
+    override open class var name: String { .init(describing: Item.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Language.swift b/Sources/SwiftRss/Language.swift
index f568d83..22c231c 100644
--- a/Sources/SwiftRss/Language.swift
+++ b/Sources/SwiftRss/Language.swift
@@ -7,5 +7,5 @@
 
 open class Language: StandardTag {
 
-    override open class var name: String { .init(Language.self) }
+    override open class var name: String { .init(describing: Language.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Link.swift b/Sources/SwiftRss/Link.swift
index d5df1e0..3b0d750 100644
--- a/Sources/SwiftRss/Link.swift
+++ b/Sources/SwiftRss/Link.swift
@@ -7,5 +7,5 @@
 
 open class Link: StandardTag {
 
-    override open class var name: String { .init(Link.self) }
+    override open class var name: String { .init(describing: Link.self).lowercased() }
 }
diff --git a/Sources/SwiftRss/Rss.swift b/Sources/SwiftRss/Rss.swift
index 67770da..baa9264 100644
--- a/Sources/SwiftRss/Rss.swift
+++ b/Sources/SwiftRss/Rss.swift
@@ -8,7 +8,7 @@
 // https://validator.w3.org/feed/docs/rss2.html#ltttlgtSubelementOfLtchannelgt
 open class Rss: StandardTag {
     
-    override open class var name: String { .init(Rss.self) }
+    override open class var name: String { .init(describing: Rss.self).lowercased() }
     
     public init(@TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
diff --git a/Sources/SwiftRss/Title.swift b/Sources/SwiftRss/Title.swift
index 751f01a..f526f63 100644
--- a/Sources/SwiftRss/Title.swift
+++ b/Sources/SwiftRss/Title.swift
@@ -7,7 +7,7 @@
 
 open class Title: StandardTag {
     
-    override open class var name: String { .init(Title.self) }
+    override open class var name: String { .init(describing: Title.self).lowercased() }
 
     public init(_ contents: String) {
         super.init()
diff --git a/Sources/SwiftRss/Ttl.swift b/Sources/SwiftRss/Ttl.swift
index 3a39a81..fb7e86f 100644
--- a/Sources/SwiftRss/Ttl.swift
+++ b/Sources/SwiftRss/Ttl.swift
@@ -7,7 +7,7 @@
 
 open class Ttl: StandardTag {
     
-    override open class var name: String { .init(Ttl.self) }
+    override open class var name: String { .init(describing: Ttl.self).lowercased() }
 
     public init(_ value: Int) {
         super.init()
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 6edafe2..1a3b48b 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -22,7 +22,7 @@ open class Tag {
     public private(set) var children: [Tag]?
     
     open class var kind: Kind? { nil }
-    open class var name: String { .init(self).lowercased() }
+    open class var name: String { .init(describing: self).lowercased() }
     
     // MARK: - init
     public init(kind: Kind? = nil,
@@ -139,11 +139,3 @@ open class Tag {
         return self
     }
 }
-
-public extension String {
-    
-    /// convert class names into node names
-    init(_ `class`: AnyClass) {
-        self.init(stringLiteral: .init(describing: `class`.self).lowercased())
-    }
-}
diff --git a/Sources/SwiftSitemap/ChangeFreq.swift b/Sources/SwiftSitemap/ChangeFreq.swift
index 3d26129..ab2a529 100644
--- a/Sources/SwiftSitemap/ChangeFreq.swift
+++ b/Sources/SwiftSitemap/ChangeFreq.swift
@@ -7,7 +7,7 @@
 
 open class ChangeFreq: StandardTag {
     
-    override open class var name: String { .init(ChangeFreq.self) }
+    override open class var name: String { .init(describing: ChangeFreq.self).lowercased() }
     
     public enum Value: String {
         case always
diff --git a/Sources/SwiftSitemap/LastMod.swift b/Sources/SwiftSitemap/LastMod.swift
index cc553ee..172c623 100644
--- a/Sources/SwiftSitemap/LastMod.swift
+++ b/Sources/SwiftSitemap/LastMod.swift
@@ -7,5 +7,5 @@
 
 open class LastMod: StandardTag {
 
-    override open class var name: String { .init(LastMod.self) }
+    override open class var name: String { .init(describing: LastMod.self).lowercased() }
 }
diff --git a/Sources/SwiftSitemap/Loc.swift b/Sources/SwiftSitemap/Loc.swift
index 29757fa..b917fb6 100644
--- a/Sources/SwiftSitemap/Loc.swift
+++ b/Sources/SwiftSitemap/Loc.swift
@@ -7,5 +7,5 @@
 
 open class Loc: StandardTag {
     
-    override open class var name: String { .init(Loc.self) }
+    override open class var name: String { .init(describing: Loc.self).lowercased() }
 }
diff --git a/Sources/SwiftSitemap/Priority.swift b/Sources/SwiftSitemap/Priority.swift
index c84f8a3..1282b94 100644
--- a/Sources/SwiftSitemap/Priority.swift
+++ b/Sources/SwiftSitemap/Priority.swift
@@ -7,7 +7,7 @@
 
 open class Priority: StandardTag {
     
-    override open class var name: String { .init(Priority.self) }
+    override open class var name: String { .init(describing: Priority.self).lowercased() }
 
     public init(_ value: Double) {
         super.init()
diff --git a/Sources/SwiftSitemap/Sitemap.swift b/Sources/SwiftSitemap/Sitemap.swift
index f491d4d..24cc92e 100644
--- a/Sources/SwiftSitemap/Sitemap.swift
+++ b/Sources/SwiftSitemap/Sitemap.swift
@@ -8,5 +8,5 @@
 // https://www.sitemaps.org/protocol.html
 open class Sitemap: StandardTag {
     
-    override open class var name: String { .init(Sitemap.self) }
+    override open class var name: String { .init(describing: Sitemap.self).lowercased() }
 }
diff --git a/Sources/SwiftSitemap/SitemapIndex.swift b/Sources/SwiftSitemap/SitemapIndex.swift
index 78ad84e..8a8902b 100644
--- a/Sources/SwiftSitemap/SitemapIndex.swift
+++ b/Sources/SwiftSitemap/SitemapIndex.swift
@@ -7,7 +7,7 @@
 
 open class SitemapIndex: StandardTag {
     
-    override open class var name: String { .init(SitemapIndex.self) }
+    override open class var name: String { .init(describing: SitemapIndex.self).lowercased() }
 
     public init(@TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
diff --git a/Sources/SwiftSitemap/Url.swift b/Sources/SwiftSitemap/Url.swift
index 0c2d963..18e069f 100644
--- a/Sources/SwiftSitemap/Url.swift
+++ b/Sources/SwiftSitemap/Url.swift
@@ -7,5 +7,5 @@
 
 open class Url: StandardTag {
     
-    override open class var name: String { .init(Url.self) }
+    override open class var name: String { .init(describing: Url.self).lowercased() }
 }
diff --git a/Sources/SwiftSitemap/UrlSet.swift b/Sources/SwiftSitemap/UrlSet.swift
index c9a7c2d..4c624e9 100644
--- a/Sources/SwiftSitemap/UrlSet.swift
+++ b/Sources/SwiftSitemap/UrlSet.swift
@@ -7,7 +7,7 @@
 
 open class UrlSet: StandardTag {
     
-    override open class var name: String { .init(UrlSet.self) }
+    override open class var name: String { .init(describing: UrlSet.self).lowercased() }
 
     public init(@TagBuilder _ builder: () -> Tag) {
         super.init([builder()])
diff --git a/Sources/SwiftSvg/Circle.swift b/Sources/SwiftSvg/Circle.swift
index cfb3135..8f65c14 100644
--- a/Sources/SwiftSvg/Circle.swift
+++ b/Sources/SwiftSvg/Circle.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/circle
 open class Circle: StandardTag {
     
-    override open class var name: String { .init(Circle.self) }
+    override open class var name: String { .init(describing: Circle.self).lowercased() }
 
     public init(cx: Double,
                 cy: Double,
diff --git a/Sources/SwiftSvg/Ellipse.swift b/Sources/SwiftSvg/Ellipse.swift
index a785269..1e871c7 100644
--- a/Sources/SwiftSvg/Ellipse.swift
+++ b/Sources/SwiftSvg/Ellipse.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/ellipse
 open class Ellipse: EmptyTag {
     
-    override open class var name: String { .init(Ellipse.self) }
+    override open class var name: String { .init(describing: Ellipse.self).lowercased() }
 
     public init(cx: Double,
                 cy: Double,
diff --git a/Sources/SwiftSvg/Line.swift b/Sources/SwiftSvg/Line.swift
index 09ab205..638c51e 100644
--- a/Sources/SwiftSvg/Line.swift
+++ b/Sources/SwiftSvg/Line.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/line
 open class Line: StandardTag {
     
-    override open class var name: String { .init(Line.self) }
+    override open class var name: String { .init(describing: Line.self).lowercased() }
 
     public init(x1: Double,
                 y1: Double,
diff --git a/Sources/SwiftSvg/Path.swift b/Sources/SwiftSvg/Path.swift
index 6317cc6..46490a5 100644
--- a/Sources/SwiftSvg/Path.swift
+++ b/Sources/SwiftSvg/Path.swift
@@ -9,7 +9,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/path
 open class Path: StandardTag {
     
-    override open class var name: String { .init(Path.self) }
+    override open class var name: String { .init(describing: Path.self).lowercased() }
 
     public init(_ d: String, pathLength: Double? = nil) {
         super.init()
diff --git a/Sources/SwiftSvg/Polygon.swift b/Sources/SwiftSvg/Polygon.swift
index f8307af..adff16a 100644
--- a/Sources/SwiftSvg/Polygon.swift
+++ b/Sources/SwiftSvg/Polygon.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/polygon
 open class Polygon: StandardTag {
     
-    override open class var name: String { .init(Polygon.self) }
+    override open class var name: String { .init(describing: Polygon.self).lowercased() }
 
     public init(_ points: [Double], pathLength: Double? = nil) {
         super.init()
diff --git a/Sources/SwiftSvg/Polyline.swift b/Sources/SwiftSvg/Polyline.swift
index bf989ce..e1b019a 100644
--- a/Sources/SwiftSvg/Polyline.swift
+++ b/Sources/SwiftSvg/Polyline.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/polyline
 open class Polyline: StandardTag {
     
-    override open class var name: String { .init(Polyline.self) }
+    override open class var name: String { .init(describing: Polyline.self).lowercased() }
 
     public init(_ points: [Double], pathLength: Double? = nil) {
         super.init()
diff --git a/Sources/SwiftSvg/Rect.swift b/Sources/SwiftSvg/Rect.swift
index 90c4918..cc05469 100644
--- a/Sources/SwiftSvg/Rect.swift
+++ b/Sources/SwiftSvg/Rect.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element/rect
 open class Rect: EmptyTag {
     
-    override open class var name: String { .init(Rect.self) }
+    override open class var name: String { .init(describing: Rect.self).lowercased() }
 
     public init(x: Double,
                 y: Double,
diff --git a/Sources/SwiftSvg/Svg.swift b/Sources/SwiftSvg/Svg.swift
index 8ea0271..7f3c6b3 100644
--- a/Sources/SwiftSvg/Svg.swift
+++ b/Sources/SwiftSvg/Svg.swift
@@ -8,7 +8,7 @@
 /// https://developer.mozilla.org/en-US/docs/Web/SVG/Element
 open class Svg: StandardTag {
     
-    override open class var name: String { .init(Svg.self) }
+    override open class var name: String { .init(describing: Svg.self).lowercased() }
 }
 
 public extension Svg {
diff --git a/Tests/SwiftHtmlTests/TagCompositionTests.swift b/Tests/SwiftHtmlTests/TagCompositionTests.swift
index b17b3bf..cca5989 100644
--- a/Tests/SwiftHtmlTests/TagCompositionTests.swift
+++ b/Tests/SwiftHtmlTests/TagCompositionTests.swift
@@ -105,7 +105,7 @@ final class TagCompositionTests: XCTestCase {
         let doc = Document {
             H1("foo")
             for value in ["1", "2", "3"] {
-                GroupTag {
+                Tag {
                     H2(value)
                     ListComponent(["a", "b", "c"])
                 }

From 871990de8c3302b9b1af393a72ee999412dfc3bc Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 11:25:54 -0400
Subject: [PATCH 105/141] Use String(describing:) to generate tag name from
 class name

---
 Tests/SwiftHtmlTests/SwiftHtmlTests.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
index 3c32d6c..ac30a1b 100644
--- a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
+++ b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
@@ -227,7 +227,7 @@ final class SwiftHtmlTests: XCTestCase {
 
         let doc = Document {
             Div {
-                values.map { item -> Tag in
+                for item in values {
                     Tag {
                         H1(item)
                         P(item)

From c0ec08f7c9f18e3ae5d88332720eec0b98246900 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 12:58:02 -0400
Subject: [PATCH 106/141] Add language property to Html tag

---
 Sources/SwiftHtml/Tags/Html.swift | 207 ++++++++++++++++++++++++++++++
 1 file changed, 207 insertions(+)

diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 148f7f4..ef689b3 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -13,6 +13,20 @@
 open class Html: StandardTag {
     
     override open class var name: String { .init(describing: Html.self).lowercased() }
+    
+    public private(set) var lang: Lang?
+    
+    public init(lang: Lang? = nil,
+                _ children: [Tag]? = nil) {
+        self.lang = lang
+        super.init()
+        self.attribute("lang", lang?.rawValue)
+    }
+    
+    public convenience init(lang: Lang? = nil,
+                            @TagBuilder _ builder: () -> Tag) {
+        self.init(lang: lang, [builder()])
+    }
 }
 
 public extension Html {
@@ -22,3 +36,196 @@ public extension Html {
         attribute("xmlns", "http://www.w3.org/1999/xhtml")
     }
 }
+
+public extension Html {
+    
+    enum Lang: String {
+        case abkhazian = "ab"
+        case afar = "aa"
+        case afrikaans = "af"
+        case akan = "ak"
+        case albanian = "sq"
+        case amharic = "am"
+        case arabic = "ar"
+        case aragonese = "an"
+        case armenian = "hy"
+        case assamese = "as"
+        case avaric = "av"
+        case avestan = "ae"
+        case aymara = "ay"
+        case azerbaijani = "az"
+        case bambara = "bm"
+        case bashkir = "ba"
+        case basque = "eu"
+        case belarusian = "be"
+        case bengali, bangla = "bn"
+        case bihari = "bh"
+        case bislama = "bi"
+        case bosnian = "bs"
+        case breton = "br"
+        case bulgarian = "bg"
+        case burmese = "my"
+        case catalan = "ca"
+        case chamorro = "ch"
+        case chechen = "ce"
+        case chichewa, Chewa, Nyanja = "ny"
+        case chinese = "zh"
+        case chineseSimplified = "zh-Hans"
+        case chineseTraditional = "zh-Hant"
+        case chuvash = "cv"
+        case cornish = "kw"
+        case corsican = "co"
+        case cree = "cr"
+        case croatian = "hr"
+        case czech = "cs"
+        case danish = "da"
+        case divehi, Dhivehi, Maldivian = "dv"
+        case dutch = "nl"
+        case dzongkha = "dz"
+        case english = "en"
+        case esperanto = "eo"
+        case estonian = "et"
+        case ewe = "ee"
+        case faroese = "fo"
+        case fijian = "fj"
+        case finnish = "fi"
+        case french = "fr"
+        case fula, Fulah, Pulaar, Pular = "ff"
+        case galician = "gl"
+        case gaelicScottish = "gd"
+        case georgian = "ka"
+        case german = "de"
+        case greek = "el"
+        case greenlandic, kalaallisut = "kl"
+        case guarani = "gn"
+        case gujarati = "gu"
+        case haitianCreole = "ht"
+        case hausa = "ha"
+        case hebrew = "he"
+        case herero = "hz"
+        case hindi = "hi"
+        case hiriMotu = "ho"
+        case hungarian = "hu"
+        case icelandic = "is"
+        case ido = "io"
+        case igbo = "ig"
+        case indonesian = "id, in"
+        case interlingua = "ia"
+        case interlingue = "ie"
+        case inuktitut = "iu"
+        case inupiak = "ik"
+        case irish = "ga"
+        case italian = "it"
+        case japanese = "ja"
+        case javanese = "jv"
+        case kannada = "kn"
+        case kanuri = "kr"
+        case kashmiri = "ks"
+        case kazakh = "kk"
+        case khmer = "km"
+        case kikuyu = "ki"
+        case kinyarwanda, rwanda = "rw"
+        case kirundi = "rn"
+        case kyrgyz = "ky"
+        case komi = "kv"
+        case kongo = "kg"
+        case korean = "ko"
+        case kurdish = "ku"
+        case kwanyama = "kj"
+        case lao = "lo"
+        case latin = "la"
+        case latvian, lettish = "lv"
+        case limburgish, limburger = "li"
+        case lingala = "ln"
+        case lithuanian = "lt"
+        case lugaKatanga = "lu"
+        case luganda, Ganda = "lg"
+        case luxembourgish = "lb"
+        case manx = "gv"
+        case macedonian = "mk"
+        case malagasy = "mg"
+        case malay = "ms"
+        case malayalam = "ml"
+        case maltese = "mt"
+        case maori = "mi"
+        case marathi = "mr"
+        case marshallese = "mh"
+        case moldavian = "mo"
+        case mongolian = "mn"
+        case nauru = "na"
+        case navajo = "nv"
+        case ndonga = "ng"
+        case northernNdebele = "nd"
+        case nepali = "ne"
+        case norwegian = "no"
+        case norwegianBokmål = "nb"
+        case norwegianNynorsk = "nn"
+        case nuosu, sichuanYi = "ii"
+        case occitan = "oc"
+        case ojibwe = "oj"
+        case oldChurchSlavonic, oldBulgarian = "cu"
+        case oriya = "or"
+        case oromo, afaanOromo = "om"
+        case ossetian = "os"
+        case pāli = "pi"
+        case pashto, Pushto = "ps"
+        case persian, farsi = "fa"
+        case polish = "pl"
+        case portuguese = "pt"
+        case punjabiEastern = "pa"
+        case quechua = "qu"
+        case romansh = "rm"
+        case romanian = "ro"
+        case russian = "ru"
+        case sami = "se"
+        case samoan = "sm"
+        case sango = "sg"
+        case sanskrit = "sa"
+        case serbian = "sr"
+        case serboCroatian = "sh"
+        case sesotho = "st"
+        case setswana = "tn"
+        case shona = "sn"
+        case sindhi = "sd"
+        case sinhalese = "si"
+        case siswati, swati = "ss"
+        case slovak = "sk"
+        case slovenian = "sl"
+        case somali = "so"
+        case southernNdebele = "nr"
+        case spanish = "es"
+        case sundanese = "su"
+        case swahili, kiswahili = "sw"
+        case swedish = "sv"
+        case tagalog = "tl"
+        case tahitian = "ty"
+        case tajik = "tg"
+        case tamil = "ta"
+        case tatar = "tt"
+        case telugu = "te"
+        case thai = "th"
+        case tibetan = "bo"
+        case tigrinya = "ti"
+        case tonga = "to"
+        case tsonga = "ts"
+        case turkish = "tr"
+        case turkmen = "tk"
+        case twi = "tw"
+        case uyghur = "ug"
+        case ukrainian = "uk"
+        case urdu = "ur"
+        case uzbek = "uz"
+        case venda = "ve"
+        case vietnamese = "vi"
+        case volapük = "vo"
+        case wallon = "wa"
+        case welsh = "cy"
+        case wolof = "wo"
+        case westernFrisian = "fy"
+        case xhosa = "xh"
+        case yiddish = "yi, ji"
+        case yoruba = "yo"
+        case zhuang, Chuang = "za"
+        case zulu = "zu"
+    }
+}

From ccce25682f36c3d6386cd1663e9ac19378aeb2e8 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 13:04:21 -0400
Subject: [PATCH 107/141] Add global language attribute

---
 Sources/SwiftHtml/Attributes/Events.swift | 194 +++++++++++++++++++++
 Sources/SwiftHtml/Tags/Html.swift         | 199 +---------------------
 2 files changed, 197 insertions(+), 196 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index cf8fd8c..59e47da 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -96,6 +96,200 @@ public extension Attribute {
     }
 }
 
+public extension Attribute {
+    
+    // source https://www.w3schools.com/tags/ref_language_codes.asp
+    enum Lang: String {
+        case abkhazian = "ab"
+        case afar = "aa"
+        case afrikaans = "af"
+        case akan = "ak"
+        case albanian = "sq"
+        case amharic = "am"
+        case arabic = "ar"
+        case aragonese = "an"
+        case armenian = "hy"
+        case assamese = "as"
+        case avaric = "av"
+        case avestan = "ae"
+        case aymara = "ay"
+        case azerbaijani = "az"
+        case bambara = "bm"
+        case bashkir = "ba"
+        case basque = "eu"
+        case belarusian = "be"
+        case bengali, bangla = "bn"
+        case bihari = "bh"
+        case bislama = "bi"
+        case bosnian = "bs"
+        case breton = "br"
+        case bulgarian = "bg"
+        case burmese = "my"
+        case catalan = "ca"
+        case chamorro = "ch"
+        case chechen = "ce"
+        case chichewa, Chewa, Nyanja = "ny"
+        case chinese = "zh"
+        case chineseSimplified = "zh-Hans"
+        case chineseTraditional = "zh-Hant"
+        case chuvash = "cv"
+        case cornish = "kw"
+        case corsican = "co"
+        case cree = "cr"
+        case croatian = "hr"
+        case czech = "cs"
+        case danish = "da"
+        case divehi, Dhivehi, Maldivian = "dv"
+        case dutch = "nl"
+        case dzongkha = "dz"
+        case english = "en"
+        case esperanto = "eo"
+        case estonian = "et"
+        case ewe = "ee"
+        case faroese = "fo"
+        case fijian = "fj"
+        case finnish = "fi"
+        case french = "fr"
+        case fula, Fulah, Pulaar, Pular = "ff"
+        case galician = "gl"
+        case gaelicScottish = "gd"
+        case georgian = "ka"
+        case german = "de"
+        case greek = "el"
+        case greenlandic, kalaallisut = "kl"
+        case guarani = "gn"
+        case gujarati = "gu"
+        case haitianCreole = "ht"
+        case hausa = "ha"
+        case hebrew = "he"
+        case herero = "hz"
+        case hindi = "hi"
+        case hiriMotu = "ho"
+        case hungarian = "hu"
+        case icelandic = "is"
+        case ido = "io"
+        case igbo = "ig"
+        case indonesian = "id, in"
+        case interlingua = "ia"
+        case interlingue = "ie"
+        case inuktitut = "iu"
+        case inupiak = "ik"
+        case irish = "ga"
+        case italian = "it"
+        case japanese = "ja"
+        case javanese = "jv"
+        case kannada = "kn"
+        case kanuri = "kr"
+        case kashmiri = "ks"
+        case kazakh = "kk"
+        case khmer = "km"
+        case kikuyu = "ki"
+        case kinyarwanda, rwanda = "rw"
+        case kirundi = "rn"
+        case kyrgyz = "ky"
+        case komi = "kv"
+        case kongo = "kg"
+        case korean = "ko"
+        case kurdish = "ku"
+        case kwanyama = "kj"
+        case lao = "lo"
+        case latin = "la"
+        case latvian, lettish = "lv"
+        case limburgish, limburger = "li"
+        case lingala = "ln"
+        case lithuanian = "lt"
+        case lugaKatanga = "lu"
+        case luganda, Ganda = "lg"
+        case luxembourgish = "lb"
+        case manx = "gv"
+        case macedonian = "mk"
+        case malagasy = "mg"
+        case malay = "ms"
+        case malayalam = "ml"
+        case maltese = "mt"
+        case maori = "mi"
+        case marathi = "mr"
+        case marshallese = "mh"
+        case moldavian = "mo"
+        case mongolian = "mn"
+        case nauru = "na"
+        case navajo = "nv"
+        case ndonga = "ng"
+        case northernNdebele = "nd"
+        case nepali = "ne"
+        case norwegian = "no"
+        case norwegianBokmål = "nb"
+        case norwegianNynorsk = "nn"
+        case nuosu, sichuanYi = "ii"
+        case occitan = "oc"
+        case ojibwe = "oj"
+        case oldChurchSlavonic, oldBulgarian = "cu"
+        case oriya = "or"
+        case oromo, afaanOromo = "om"
+        case ossetian = "os"
+        case pāli = "pi"
+        case pashto, Pushto = "ps"
+        case persian, farsi = "fa"
+        case polish = "pl"
+        case portuguese = "pt"
+        case punjabiEastern = "pa"
+        case quechua = "qu"
+        case romansh = "rm"
+        case romanian = "ro"
+        case russian = "ru"
+        case sami = "se"
+        case samoan = "sm"
+        case sango = "sg"
+        case sanskrit = "sa"
+        case serbian = "sr"
+        case serboCroatian = "sh"
+        case sesotho = "st"
+        case setswana = "tn"
+        case shona = "sn"
+        case sindhi = "sd"
+        case sinhalese = "si"
+        case siswati, swati = "ss"
+        case slovak = "sk"
+        case slovenian = "sl"
+        case somali = "so"
+        case southernNdebele = "nr"
+        case spanish = "es"
+        case sundanese = "su"
+        case swahili, kiswahili = "sw"
+        case swedish = "sv"
+        case tagalog = "tl"
+        case tahitian = "ty"
+        case tajik = "tg"
+        case tamil = "ta"
+        case tatar = "tt"
+        case telugu = "te"
+        case thai = "th"
+        case tibetan = "bo"
+        case tigrinya = "ti"
+        case tonga = "to"
+        case tsonga = "ts"
+        case turkish = "tr"
+        case turkmen = "tk"
+        case twi = "tw"
+        case uyghur = "ug"
+        case ukrainian = "uk"
+        case urdu = "ur"
+        case uzbek = "uz"
+        case venda = "ve"
+        case vietnamese = "vi"
+        case volapük = "vo"
+        case wallon = "wa"
+        case welsh = "cy"
+        case wolof = "wo"
+        case westernFrisian = "fy"
+        case xhosa = "xh"
+        case yiddish = "yi, ji"
+        case yoruba = "yo"
+        case zhuang, Chuang = "za"
+        case zulu = "zu"
+    }
+}
+
 public extension Tag {
     
     @discardableResult
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index ef689b3..366e6a6 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -14,16 +14,16 @@ open class Html: StandardTag {
     
     override open class var name: String { .init(describing: Html.self).lowercased() }
     
-    public private(set) var lang: Lang?
+    public private(set) var lang: Attribute.Lang?
     
-    public init(lang: Lang? = nil,
+    public init(lang: Attribute.Lang? = nil,
                 _ children: [Tag]? = nil) {
         self.lang = lang
         super.init()
         self.attribute("lang", lang?.rawValue)
     }
     
-    public convenience init(lang: Lang? = nil,
+    public convenience init(lang: Attribute.Lang? = nil,
                             @TagBuilder _ builder: () -> Tag) {
         self.init(lang: lang, [builder()])
     }
@@ -36,196 +36,3 @@ public extension Html {
         attribute("xmlns", "http://www.w3.org/1999/xhtml")
     }
 }
-
-public extension Html {
-    
-    enum Lang: String {
-        case abkhazian = "ab"
-        case afar = "aa"
-        case afrikaans = "af"
-        case akan = "ak"
-        case albanian = "sq"
-        case amharic = "am"
-        case arabic = "ar"
-        case aragonese = "an"
-        case armenian = "hy"
-        case assamese = "as"
-        case avaric = "av"
-        case avestan = "ae"
-        case aymara = "ay"
-        case azerbaijani = "az"
-        case bambara = "bm"
-        case bashkir = "ba"
-        case basque = "eu"
-        case belarusian = "be"
-        case bengali, bangla = "bn"
-        case bihari = "bh"
-        case bislama = "bi"
-        case bosnian = "bs"
-        case breton = "br"
-        case bulgarian = "bg"
-        case burmese = "my"
-        case catalan = "ca"
-        case chamorro = "ch"
-        case chechen = "ce"
-        case chichewa, Chewa, Nyanja = "ny"
-        case chinese = "zh"
-        case chineseSimplified = "zh-Hans"
-        case chineseTraditional = "zh-Hant"
-        case chuvash = "cv"
-        case cornish = "kw"
-        case corsican = "co"
-        case cree = "cr"
-        case croatian = "hr"
-        case czech = "cs"
-        case danish = "da"
-        case divehi, Dhivehi, Maldivian = "dv"
-        case dutch = "nl"
-        case dzongkha = "dz"
-        case english = "en"
-        case esperanto = "eo"
-        case estonian = "et"
-        case ewe = "ee"
-        case faroese = "fo"
-        case fijian = "fj"
-        case finnish = "fi"
-        case french = "fr"
-        case fula, Fulah, Pulaar, Pular = "ff"
-        case galician = "gl"
-        case gaelicScottish = "gd"
-        case georgian = "ka"
-        case german = "de"
-        case greek = "el"
-        case greenlandic, kalaallisut = "kl"
-        case guarani = "gn"
-        case gujarati = "gu"
-        case haitianCreole = "ht"
-        case hausa = "ha"
-        case hebrew = "he"
-        case herero = "hz"
-        case hindi = "hi"
-        case hiriMotu = "ho"
-        case hungarian = "hu"
-        case icelandic = "is"
-        case ido = "io"
-        case igbo = "ig"
-        case indonesian = "id, in"
-        case interlingua = "ia"
-        case interlingue = "ie"
-        case inuktitut = "iu"
-        case inupiak = "ik"
-        case irish = "ga"
-        case italian = "it"
-        case japanese = "ja"
-        case javanese = "jv"
-        case kannada = "kn"
-        case kanuri = "kr"
-        case kashmiri = "ks"
-        case kazakh = "kk"
-        case khmer = "km"
-        case kikuyu = "ki"
-        case kinyarwanda, rwanda = "rw"
-        case kirundi = "rn"
-        case kyrgyz = "ky"
-        case komi = "kv"
-        case kongo = "kg"
-        case korean = "ko"
-        case kurdish = "ku"
-        case kwanyama = "kj"
-        case lao = "lo"
-        case latin = "la"
-        case latvian, lettish = "lv"
-        case limburgish, limburger = "li"
-        case lingala = "ln"
-        case lithuanian = "lt"
-        case lugaKatanga = "lu"
-        case luganda, Ganda = "lg"
-        case luxembourgish = "lb"
-        case manx = "gv"
-        case macedonian = "mk"
-        case malagasy = "mg"
-        case malay = "ms"
-        case malayalam = "ml"
-        case maltese = "mt"
-        case maori = "mi"
-        case marathi = "mr"
-        case marshallese = "mh"
-        case moldavian = "mo"
-        case mongolian = "mn"
-        case nauru = "na"
-        case navajo = "nv"
-        case ndonga = "ng"
-        case northernNdebele = "nd"
-        case nepali = "ne"
-        case norwegian = "no"
-        case norwegianBokmål = "nb"
-        case norwegianNynorsk = "nn"
-        case nuosu, sichuanYi = "ii"
-        case occitan = "oc"
-        case ojibwe = "oj"
-        case oldChurchSlavonic, oldBulgarian = "cu"
-        case oriya = "or"
-        case oromo, afaanOromo = "om"
-        case ossetian = "os"
-        case pāli = "pi"
-        case pashto, Pushto = "ps"
-        case persian, farsi = "fa"
-        case polish = "pl"
-        case portuguese = "pt"
-        case punjabiEastern = "pa"
-        case quechua = "qu"
-        case romansh = "rm"
-        case romanian = "ro"
-        case russian = "ru"
-        case sami = "se"
-        case samoan = "sm"
-        case sango = "sg"
-        case sanskrit = "sa"
-        case serbian = "sr"
-        case serboCroatian = "sh"
-        case sesotho = "st"
-        case setswana = "tn"
-        case shona = "sn"
-        case sindhi = "sd"
-        case sinhalese = "si"
-        case siswati, swati = "ss"
-        case slovak = "sk"
-        case slovenian = "sl"
-        case somali = "so"
-        case southernNdebele = "nr"
-        case spanish = "es"
-        case sundanese = "su"
-        case swahili, kiswahili = "sw"
-        case swedish = "sv"
-        case tagalog = "tl"
-        case tahitian = "ty"
-        case tajik = "tg"
-        case tamil = "ta"
-        case tatar = "tt"
-        case telugu = "te"
-        case thai = "th"
-        case tibetan = "bo"
-        case tigrinya = "ti"
-        case tonga = "to"
-        case tsonga = "ts"
-        case turkish = "tr"
-        case turkmen = "tk"
-        case twi = "tw"
-        case uyghur = "ug"
-        case ukrainian = "uk"
-        case urdu = "ur"
-        case uzbek = "uz"
-        case venda = "ve"
-        case vietnamese = "vi"
-        case volapük = "vo"
-        case wallon = "wa"
-        case welsh = "cy"
-        case wolof = "wo"
-        case westernFrisian = "fy"
-        case xhosa = "xh"
-        case yiddish = "yi, ji"
-        case yoruba = "yo"
-        case zhuang, Chuang = "za"
-        case zulu = "zu"
-    }
-}

From f2d7257b92a28674eab92f566aada32d83fa087b Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 14:32:28 -0400
Subject: [PATCH 108/141] Minor tweaks to Head

---
 Sources/SwiftHtml/Tags/Head.swift | 35 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index f451120..77740e3 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -32,11 +32,11 @@ open class Head: StandardTag {
     public private(set) var bases: [Base]?
     
     public init(title: Title? = nil,
-                styles: [Style]? = nil,
-                links: [Link]? = nil,
-                metas: [Meta]? = nil,
-                scripts: [Script]? = nil,
-                bases: [Base]? = nil,
+                styles: [Style] = [],
+                links: [Link] = [],
+                metas: [Meta] = [],
+                scripts: [Script] = [],
+                bases: [Base] = [],
                 _ children: [Tag]? = nil) {
         self.title = title
         self.styles = styles
@@ -44,24 +44,23 @@ open class Head: StandardTag {
         self.metas = metas
         self.scripts = scripts
         self.bases = bases
-        let temp = Tag {
+        super.init(name: Self.name, Tag {
             title != nil ? [title!] : []
-            styles ?? []
-            links ?? []
-            metas ?? []
-            scripts ?? []
-            bases ?? []
+            styles
+            links
+            metas
+            scripts
+            bases
             children ?? []
-        }
-        super.init(name: Self.name, temp.children)
+        }.children)
     }
     
     public convenience init(title: Title? = nil,
-                            styles: [Style]? = nil,
-                            links: [Link]? = nil,
-                            metas: [Meta]? = nil,
-                            scripts: [Script]? = nil,
-                            bases: [Base]? = nil,
+                            styles: [Style] = [],
+                            links: [Link] = [],
+                            metas: [Meta] = [],
+                            scripts: [Script] = [],
+                            bases: [Base] = [],
                             @TagBuilder _ builder: () -> Tag) {
         self.init(title: title,
                   styles: styles,

From 00b7a1d436317d22de761f4ede3b51515da5ef79 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 14:37:34 -0400
Subject: [PATCH 109/141] Minor tweaks to Head

---
 Sources/SwiftHtml/Tags/Head.swift | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index 77740e3..da03695 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -25,49 +25,55 @@ open class Head: StandardTag {
     override open class var name: String { .init(describing: Head.self).lowercased() }
     
     public private(set) var title: Title?
-    public private(set) var styles: [Style]?
-    public private(set) var links: [Link]?
-    public private(set) var metas: [Meta]?
-    public private(set) var scripts: [Script]?
-    public private(set) var bases: [Base]?
+    public private(set) var styles: [Style]
+    public private(set) var bases: [Base]
+    public private(set) var links: [Link]
+    public private(set) var metas: [Meta]
+    public private(set) var scripts: [Script]
+    public private(set) var noscripts: [Noscript]
     
     public init(title: Title? = nil,
                 styles: [Style] = [],
+                bases: [Base] = [],
                 links: [Link] = [],
                 metas: [Meta] = [],
                 scripts: [Script] = [],
-                bases: [Base] = [],
+                noscripts: [Noscript] = [],
                 _ children: [Tag]? = nil) {
         self.title = title
         self.styles = styles
+        self.bases = bases
         self.links = links
         self.metas = metas
         self.scripts = scripts
-        self.bases = bases
+        self.noscripts = noscripts
         super.init(name: Self.name, Tag {
             title != nil ? [title!] : []
             styles
+            bases
             links
             metas
             scripts
-            bases
+            noscripts
             children ?? []
         }.children)
     }
     
     public convenience init(title: Title? = nil,
                             styles: [Style] = [],
+                            bases: [Base] = [],
                             links: [Link] = [],
                             metas: [Meta] = [],
                             scripts: [Script] = [],
-                            bases: [Base] = [],
+                            noscripts: [Noscript] = [],
                             @TagBuilder _ builder: () -> Tag) {
         self.init(title: title,
                   styles: styles,
+                  bases: bases,
                   links: links,
                   metas: metas,
                   scripts: scripts,
-                  bases: bases,
+                  noscripts: noscripts,
                   [builder()])
     }
 }

From 4f01877d05f669799d35495a3a4bcefdbd66c93d Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:12:04 -0400
Subject: [PATCH 110/141] Head convenience init

---
 Sources/SwiftHtml/Tags/Head.swift | 66 ++++++++-----------------------
 1 file changed, 17 insertions(+), 49 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index da03695..91c5112 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -24,56 +24,24 @@ open class Head: StandardTag {
     
     override open class var name: String { .init(describing: Head.self).lowercased() }
     
-    public private(set) var title: Title?
-    public private(set) var styles: [Style]
-    public private(set) var bases: [Base]
-    public private(set) var links: [Link]
-    public private(set) var metas: [Meta]
-    public private(set) var scripts: [Script]
-    public private(set) var noscripts: [Noscript]
-    
-    public init(title: Title? = nil,
-                styles: [Style] = [],
-                bases: [Base] = [],
-                links: [Link] = [],
-                metas: [Meta] = [],
-                scripts: [Script] = [],
-                noscripts: [Noscript] = [],
-                _ children: [Tag]? = nil) {
-        self.title = title
-        self.styles = styles
-        self.bases = bases
-        self.links = links
-        self.metas = metas
-        self.scripts = scripts
-        self.noscripts = noscripts
-        super.init(name: Self.name, Tag {
-            title != nil ? [title!] : []
-            styles
-            bases
-            links
-            metas
-            scripts
-            noscripts
-            children ?? []
-        }.children)
-    }
-    
     public convenience init(title: Title? = nil,
-                            styles: [Style] = [],
-                            bases: [Base] = [],
-                            links: [Link] = [],
-                            metas: [Meta] = [],
-                            scripts: [Script] = [],
-                            noscripts: [Noscript] = [],
+                            @TagBuilder style: () -> [Style],
+                            @TagBuilder base: () -> [Base],
+                            @TagBuilder link: () -> [Link],
+                            @TagBuilder meta: () -> [Meta],
+                            @TagBuilder script: () -> [Script],
+                            @TagBuilder noscript: () -> [Noscript],
                             @TagBuilder _ builder: () -> Tag) {
-        self.init(title: title,
-                  styles: styles,
-                  bases: bases,
-                  links: links,
-                  metas: metas,
-                  scripts: scripts,
-                  noscripts: noscripts,
-                  [builder()])
+        let temp = Tag {
+            title != nil ? [title!] : []
+            style()
+            base()
+            link()
+            meta()
+            script()
+            noscript()
+            [builder()]
+        }
+        self.init(name: Self.name, temp.children)
     }
 }

From 15dab20e7cee99a6cb96e08181640506ec178cbb Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:20:07 -0400
Subject: [PATCH 111/141] Remove on... prefix

---
 Sources/SwiftHtml/Attributes/Events.swift | 140 +++++++++++-----------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 59e47da..20c9439 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -11,83 +11,83 @@ public extension Attribute {
     
     enum Event: String {
         // Windows
-        case onAfterPrint       // Script to be run after the document is printed
-        case onBeforePrint      // Script to be run before the document is printed
-        case onBeforeUnload     // Script to be run when the document is about to be unloaded
-        case onError            // Script to be run when an error occurs
-        case onHashChange       // Script to be run when there has been changes to the anchor part of the a URL
-        case onLoad             // Fires after the page is finished loading
-        case onMessage          // Script to be run when the message is triggered
-        case onOffline          // Script to be run when the browser starts to work offline
-        case onOnline           // Script to be run when the browser starts to work online
-        case onPageHide         // Script to be run when a user navigates away from a page
-        case onPageShow         // Script to be run when a user navigates to a page
-        case onPopState         // Script to be run when the window's history changes
-        case onResize           // Fires when the browser window is resized
-        case onStorage          // Script to be run when a Web Storage area is updated
-        case onUnload           // Fires once a page has unloaded (or the browser window has been closed)
+        case afterPrint       // Script to be run after the document is printed
+        case beforePrint      // Script to be run before the document is printed
+        case beforeUnload     // Script to be run when the document is about to be unloaded
+        case error            // Script to be run when an error occurs
+        case hashChange       // Script to be run when there has been changes to the anchor part of the a URL
+        case load             // Fires after the page is finished loading
+        case message          // Script to be run when the message is triggered
+        case offline          // Script to be run when the browser starts to work offline
+        case online           // Script to be run when the browser starts to work online
+        case pageHide         // Script to be run when a user navigates away from a page
+        case pageShow         // Script to be run when a user navigates to a page
+        case popState         // Script to be run when the window's history changes
+        case resize           // Fires when the browser window is resized
+        case storage          // Script to be run when a Web Storage area is updated
+        case unload           // Fires once a page has unloaded (or the browser window has been closed)
         // Forms
-        case onBlur             // Fires the moment that the element loses focus
-        case onChange           // Fires the moment when the value of the element is changed
-        case onContextMenu      // Script to be run when a context menu is triggered
-        case onFocus            // Fires the moment when the element gets focus
-        case onInput            // Script to be run when an element gets user input
-        case onInvalid          // Script to be run when an element is invalid
-        case onReset            // Fires when the Reset button in a form is clicked
-        case onSearch           // Fires when the user writes something in a search field (for <input="search">)
-        case onSelect           // Fires after some text has been selected in an element
-        case onSubmit           // Fires when a form is submitted
+        case blur             // Fires the moment that the element loses focus
+        case change           // Fires the moment when the value of the element is changed
+        case contextMenu      // Script to be run when a context menu is triggered
+        case focus            // Fires the moment when the element gets focus
+        case input            // Script to be run when an element gets user input
+        case invalid          // Script to be run when an element is invalid
+        case reset            // Fires when the Reset button in a form is clicked
+        case search           // Fires when the user writes something in a search field (for <input="search">)
+        case select           // Fires after some text has been selected in an element
+        case submit           // Fires when a form is submitted
         // Keyboard
-        case onKeyDown          // Fires when a user is pressing a key
-        case onKeyPress         // Fires when a user presses a key
-        case onKeyUp            // Fires when a user releases a key
+        case keyDown          // Fires when a user is pressing a key
+        case keyPress         // Fires when a user presses a key
+        case keyUp            // Fires when a user releases a key
         // Mouse
-        case onClick            // Fires on a mouse click on the element
-        case onDoubleClick      // Fires on a mouse double-click on the element
-        case onMouseDown        // Fires when a mouse button is pressed down on an element
-        case onMouseMove        // Fires when the mouse pointer is moving while it is over an element
-        case onMouseOut         // Fires when the mouse pointer moves out of an element
-        case onMouseOver        // Fires when the mouse pointer moves over an element
-        case onMouseUp          // Fires when a mouse button is released over an element
-        case onWheel            // Fires when the mouse wheel rolls up or down over an element
+        case click            // Fires on a mouse click on the element
+        case doubleClick      // Fires on a mouse double-click on the element
+        case mouseDown        // Fires when a mouse button is pressed down on an element
+        case mouseMove        // Fires when the mouse pointer is moving while it is over an element
+        case mouseOut         // Fires when the mouse pointer moves out of an element
+        case mouseOver        // Fires when the mouse pointer moves over an element
+        case mouseUp          // Fires when a mouse button is released over an element
+        case wheel            // Fires when the mouse wheel rolls up or down over an element
         // Drag and Drop
-        case onDrag             // Script to be run when an element is dragged
-        case onDragEnd          // Script to be run at the end of a drag operation
-        case onDragEnter        // Script to be run when an element has been dragged to a valid drop target
-        case onDragLeave        // Script to be run when an element leaves a valid drop target
-        case onDragOver         // Script to be run when an element is being dragged over a valid drop target
-        case onDragStart        // Script to be run at the start of a drag operation
-        case onDrop             // Script to be run when dragged element is being dropped
-        case onScroll           // Script to be run when an element's scrollbar is being scrolled
+        case drag             // Script to be run when an element is dragged
+        case dragEnd          // Script to be run at the end of a drag operation
+        case dragEnter        // Script to be run when an element has been dragged to a valid drop target
+        case dragLeave        // Script to be run when an element leaves a valid drop target
+        case dragOver         // Script to be run when an element is being dragged over a valid drop target
+        case dragStart        // Script to be run at the start of a drag operation
+        case drop             // Script to be run when dragged element is being dropped
+        case scroll           // Script to be run when an element's scrollbar is being scrolled
         // Clipboard
-        case onCopy             // Fires when the user copies the content of an element
-        case onCut              // Fires when the user cuts the content of an element
-        case onPaste            // Fires when the user pastes some content in an element
+        case copy             // Fires when the user copies the content of an element
+        case cut              // Fires when the user cuts the content of an element
+        case paste            // Fires when the user pastes some content in an element
         // Media
-        case onAbort            // Script to be run on abort
-        case onCanPlay          // Script to be run when a file is ready to start playing (when it has buffered enough to begin)
-        case onCanPlaythrough   // Script to be run when a file can be played all the way to the end without pausing for buffering
-        case onCueChange        // Script to be run when the cue changes in a <track> element
-        case onDurationChange   // Script to be run when the length of the media changes
-        case onEmptied          // Script to be run when something bad happens and the file is suddenly unavailable (like unexpectedly disconnects)
-        case onEnded            // Script to be run when the media has reach the end (a useful event for messages like "thanks for listening")
-        case onLoadedData       // Script to be run when media data is loaded
-        case onLoadedMetadata   // Script to be run when meta data (like dimensions and duration) are loaded
-        case onLoadStart        // Script to be run just as the file begins to load before anything is actually loaded
-        case onPause            // Script to be run when the media is paused either by the user or programmatically
-        case onPlay             // Script to be run when the media is ready to start playing
-        case onPlaying          // Script to be run when the media actually has started playing
-        case onProgress         // Script to be run when the browser is in the process of getting the media data
-        case onRateChange       // Script to be run each time the playback rate changes (like when a user switches to a slow motion or fast forward mode)
-        case onSeeked           // Script to be run when the seeking attribute is set to false indicating that seeking has ended
-        case onSeeking          // Script to be run when the seeking attribute is set to true indicating that seeking is active
-        case onStalled          // Script to be run when the browser is unable to fetch the media data for whatever reason
-        case onSuspend          // Script to be run when fetching the media data is stopped before it is completely loaded for whatever reason
-        case onTimeUpdate       // Script to be run when the playing position has changed (like when the user fast forwards to a different point in the media)
-        case onVolumeChange     // Script to be run each time the volume is changed which (includes setting the volume to "mute")
-        case onWaiting          // Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
+        case abort            // Script to be run on abort
+        case canPlay          // Script to be run when a file is ready to start playing (when it has buffered enough to begin)
+        case canPlaythrough   // Script to be run when a file can be played all the way to the end without pausing for buffering
+        case cueChange        // Script to be run when the cue changes in a <track> element
+        case durationChange   // Script to be run when the length of the media changes
+        case emptied          // Script to be run when something bad happens and the file is suddenly unavailable (like unexpectedly disconnects)
+        case ended            // Script to be run when the media has reach the end (a useful event for messages like "thanks for listening")
+        case loadedData       // Script to be run when media data is loaded
+        case loadedMetadata   // Script to be run when meta data (like dimensions and duration) are loaded
+        case loadStart        // Script to be run just as the file begins to load before anything is actually loaded
+        case pause            // Script to be run when the media is paused either by the user or programmatically
+        case play             // Script to be run when the media is ready to start playing
+        case playing          // Script to be run when the media actually has started playing
+        case progress         // Script to be run when the browser is in the process of getting the media data
+        case rateChange       // Script to be run each time the playback rate changes (like when a user switches to a slow motion or fast forward mode)
+        case seeked           // Script to be run when the seeking attribute is set to false indicating that seeking has ended
+        case seeking          // Script to be run when the seeking attribute is set to true indicating that seeking is active
+        case stalled          // Script to be run when the browser is unable to fetch the media data for whatever reason
+        case suspend          // Script to be run when fetching the media data is stopped before it is completely loaded for whatever reason
+        case timeUpdate       // Script to be run when the playing position has changed (like when the user fast forwards to a different point in the media)
+        case volumeChange     // Script to be run each time the volume is changed which (includes setting the volume to "mute")
+        case waiting          // Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
         // Misc
-        case onToggle           // Fires when the user opens or closes the <details> element
+        case toggle           // Fires when the user opens or closes the <details> element
     }
     
     struct EventFunction {

From dd51882fe446393ee19b49f2d8767ebf1bcc49fc Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:22:08 -0400
Subject: [PATCH 112/141] Move language to separate file

---
 Sources/SwiftHtml/Attributes/Events.swift   | 194 -------------------
 Sources/SwiftHtml/Attributes/Language.swift | 200 ++++++++++++++++++++
 2 files changed, 200 insertions(+), 194 deletions(-)
 create mode 100644 Sources/SwiftHtml/Attributes/Language.swift

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 20c9439..bc29774 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -96,200 +96,6 @@ public extension Attribute {
     }
 }
 
-public extension Attribute {
-    
-    // source https://www.w3schools.com/tags/ref_language_codes.asp
-    enum Lang: String {
-        case abkhazian = "ab"
-        case afar = "aa"
-        case afrikaans = "af"
-        case akan = "ak"
-        case albanian = "sq"
-        case amharic = "am"
-        case arabic = "ar"
-        case aragonese = "an"
-        case armenian = "hy"
-        case assamese = "as"
-        case avaric = "av"
-        case avestan = "ae"
-        case aymara = "ay"
-        case azerbaijani = "az"
-        case bambara = "bm"
-        case bashkir = "ba"
-        case basque = "eu"
-        case belarusian = "be"
-        case bengali, bangla = "bn"
-        case bihari = "bh"
-        case bislama = "bi"
-        case bosnian = "bs"
-        case breton = "br"
-        case bulgarian = "bg"
-        case burmese = "my"
-        case catalan = "ca"
-        case chamorro = "ch"
-        case chechen = "ce"
-        case chichewa, Chewa, Nyanja = "ny"
-        case chinese = "zh"
-        case chineseSimplified = "zh-Hans"
-        case chineseTraditional = "zh-Hant"
-        case chuvash = "cv"
-        case cornish = "kw"
-        case corsican = "co"
-        case cree = "cr"
-        case croatian = "hr"
-        case czech = "cs"
-        case danish = "da"
-        case divehi, Dhivehi, Maldivian = "dv"
-        case dutch = "nl"
-        case dzongkha = "dz"
-        case english = "en"
-        case esperanto = "eo"
-        case estonian = "et"
-        case ewe = "ee"
-        case faroese = "fo"
-        case fijian = "fj"
-        case finnish = "fi"
-        case french = "fr"
-        case fula, Fulah, Pulaar, Pular = "ff"
-        case galician = "gl"
-        case gaelicScottish = "gd"
-        case georgian = "ka"
-        case german = "de"
-        case greek = "el"
-        case greenlandic, kalaallisut = "kl"
-        case guarani = "gn"
-        case gujarati = "gu"
-        case haitianCreole = "ht"
-        case hausa = "ha"
-        case hebrew = "he"
-        case herero = "hz"
-        case hindi = "hi"
-        case hiriMotu = "ho"
-        case hungarian = "hu"
-        case icelandic = "is"
-        case ido = "io"
-        case igbo = "ig"
-        case indonesian = "id, in"
-        case interlingua = "ia"
-        case interlingue = "ie"
-        case inuktitut = "iu"
-        case inupiak = "ik"
-        case irish = "ga"
-        case italian = "it"
-        case japanese = "ja"
-        case javanese = "jv"
-        case kannada = "kn"
-        case kanuri = "kr"
-        case kashmiri = "ks"
-        case kazakh = "kk"
-        case khmer = "km"
-        case kikuyu = "ki"
-        case kinyarwanda, rwanda = "rw"
-        case kirundi = "rn"
-        case kyrgyz = "ky"
-        case komi = "kv"
-        case kongo = "kg"
-        case korean = "ko"
-        case kurdish = "ku"
-        case kwanyama = "kj"
-        case lao = "lo"
-        case latin = "la"
-        case latvian, lettish = "lv"
-        case limburgish, limburger = "li"
-        case lingala = "ln"
-        case lithuanian = "lt"
-        case lugaKatanga = "lu"
-        case luganda, Ganda = "lg"
-        case luxembourgish = "lb"
-        case manx = "gv"
-        case macedonian = "mk"
-        case malagasy = "mg"
-        case malay = "ms"
-        case malayalam = "ml"
-        case maltese = "mt"
-        case maori = "mi"
-        case marathi = "mr"
-        case marshallese = "mh"
-        case moldavian = "mo"
-        case mongolian = "mn"
-        case nauru = "na"
-        case navajo = "nv"
-        case ndonga = "ng"
-        case northernNdebele = "nd"
-        case nepali = "ne"
-        case norwegian = "no"
-        case norwegianBokmål = "nb"
-        case norwegianNynorsk = "nn"
-        case nuosu, sichuanYi = "ii"
-        case occitan = "oc"
-        case ojibwe = "oj"
-        case oldChurchSlavonic, oldBulgarian = "cu"
-        case oriya = "or"
-        case oromo, afaanOromo = "om"
-        case ossetian = "os"
-        case pāli = "pi"
-        case pashto, Pushto = "ps"
-        case persian, farsi = "fa"
-        case polish = "pl"
-        case portuguese = "pt"
-        case punjabiEastern = "pa"
-        case quechua = "qu"
-        case romansh = "rm"
-        case romanian = "ro"
-        case russian = "ru"
-        case sami = "se"
-        case samoan = "sm"
-        case sango = "sg"
-        case sanskrit = "sa"
-        case serbian = "sr"
-        case serboCroatian = "sh"
-        case sesotho = "st"
-        case setswana = "tn"
-        case shona = "sn"
-        case sindhi = "sd"
-        case sinhalese = "si"
-        case siswati, swati = "ss"
-        case slovak = "sk"
-        case slovenian = "sl"
-        case somali = "so"
-        case southernNdebele = "nr"
-        case spanish = "es"
-        case sundanese = "su"
-        case swahili, kiswahili = "sw"
-        case swedish = "sv"
-        case tagalog = "tl"
-        case tahitian = "ty"
-        case tajik = "tg"
-        case tamil = "ta"
-        case tatar = "tt"
-        case telugu = "te"
-        case thai = "th"
-        case tibetan = "bo"
-        case tigrinya = "ti"
-        case tonga = "to"
-        case tsonga = "ts"
-        case turkish = "tr"
-        case turkmen = "tk"
-        case twi = "tw"
-        case uyghur = "ug"
-        case ukrainian = "uk"
-        case urdu = "ur"
-        case uzbek = "uz"
-        case venda = "ve"
-        case vietnamese = "vi"
-        case volapük = "vo"
-        case wallon = "wa"
-        case welsh = "cy"
-        case wolof = "wo"
-        case westernFrisian = "fy"
-        case xhosa = "xh"
-        case yiddish = "yi, ji"
-        case yoruba = "yo"
-        case zhuang, Chuang = "za"
-        case zulu = "zu"
-    }
-}
-
 public extension Tag {
     
     @discardableResult
diff --git a/Sources/SwiftHtml/Attributes/Language.swift b/Sources/SwiftHtml/Attributes/Language.swift
new file mode 100644
index 0000000..fc9beff
--- /dev/null
+++ b/Sources/SwiftHtml/Attributes/Language.swift
@@ -0,0 +1,200 @@
+//
+//  Language.swift
+//  
+//
+//  Created by Brad Gourley on 7/26/23.
+//
+
+public extension Attribute {
+    
+    // source https://www.w3schools.com/tags/ref_language_codes.asp
+    enum Lang: String {
+        case abkhazian = "ab"
+        case afar = "aa"
+        case afrikaans = "af"
+        case akan = "ak"
+        case albanian = "sq"
+        case amharic = "am"
+        case arabic = "ar"
+        case aragonese = "an"
+        case armenian = "hy"
+        case assamese = "as"
+        case avaric = "av"
+        case avestan = "ae"
+        case aymara = "ay"
+        case azerbaijani = "az"
+        case bambara = "bm"
+        case bashkir = "ba"
+        case basque = "eu"
+        case belarusian = "be"
+        case bengali, bangla = "bn"
+        case bihari = "bh"
+        case bislama = "bi"
+        case bosnian = "bs"
+        case breton = "br"
+        case bulgarian = "bg"
+        case burmese = "my"
+        case catalan = "ca"
+        case chamorro = "ch"
+        case chechen = "ce"
+        case chichewa, Chewa, Nyanja = "ny"
+        case chinese = "zh"
+        case chineseSimplified = "zh-Hans"
+        case chineseTraditional = "zh-Hant"
+        case chuvash = "cv"
+        case cornish = "kw"
+        case corsican = "co"
+        case cree = "cr"
+        case croatian = "hr"
+        case czech = "cs"
+        case danish = "da"
+        case divehi, Dhivehi, Maldivian = "dv"
+        case dutch = "nl"
+        case dzongkha = "dz"
+        case english = "en"
+        case esperanto = "eo"
+        case estonian = "et"
+        case ewe = "ee"
+        case faroese = "fo"
+        case fijian = "fj"
+        case finnish = "fi"
+        case french = "fr"
+        case fula, Fulah, Pulaar, Pular = "ff"
+        case galician = "gl"
+        case gaelicScottish = "gd"
+        case georgian = "ka"
+        case german = "de"
+        case greek = "el"
+        case greenlandic, kalaallisut = "kl"
+        case guarani = "gn"
+        case gujarati = "gu"
+        case haitianCreole = "ht"
+        case hausa = "ha"
+        case hebrew = "he"
+        case herero = "hz"
+        case hindi = "hi"
+        case hiriMotu = "ho"
+        case hungarian = "hu"
+        case icelandic = "is"
+        case ido = "io"
+        case igbo = "ig"
+        case indonesian = "id, in"
+        case interlingua = "ia"
+        case interlingue = "ie"
+        case inuktitut = "iu"
+        case inupiak = "ik"
+        case irish = "ga"
+        case italian = "it"
+        case japanese = "ja"
+        case javanese = "jv"
+        case kannada = "kn"
+        case kanuri = "kr"
+        case kashmiri = "ks"
+        case kazakh = "kk"
+        case khmer = "km"
+        case kikuyu = "ki"
+        case kinyarwanda, rwanda = "rw"
+        case kirundi = "rn"
+        case kyrgyz = "ky"
+        case komi = "kv"
+        case kongo = "kg"
+        case korean = "ko"
+        case kurdish = "ku"
+        case kwanyama = "kj"
+        case lao = "lo"
+        case latin = "la"
+        case latvian, lettish = "lv"
+        case limburgish, limburger = "li"
+        case lingala = "ln"
+        case lithuanian = "lt"
+        case lugaKatanga = "lu"
+        case luganda, Ganda = "lg"
+        case luxembourgish = "lb"
+        case manx = "gv"
+        case macedonian = "mk"
+        case malagasy = "mg"
+        case malay = "ms"
+        case malayalam = "ml"
+        case maltese = "mt"
+        case maori = "mi"
+        case marathi = "mr"
+        case marshallese = "mh"
+        case moldavian = "mo"
+        case mongolian = "mn"
+        case nauru = "na"
+        case navajo = "nv"
+        case ndonga = "ng"
+        case northernNdebele = "nd"
+        case nepali = "ne"
+        case norwegian = "no"
+        case norwegianBokmål = "nb"
+        case norwegianNynorsk = "nn"
+        case nuosu, sichuanYi = "ii"
+        case occitan = "oc"
+        case ojibwe = "oj"
+        case oldChurchSlavonic, oldBulgarian = "cu"
+        case oriya = "or"
+        case oromo, afaanOromo = "om"
+        case ossetian = "os"
+        case pāli = "pi"
+        case pashto, Pushto = "ps"
+        case persian, farsi = "fa"
+        case polish = "pl"
+        case portuguese = "pt"
+        case punjabiEastern = "pa"
+        case quechua = "qu"
+        case romansh = "rm"
+        case romanian = "ro"
+        case russian = "ru"
+        case sami = "se"
+        case samoan = "sm"
+        case sango = "sg"
+        case sanskrit = "sa"
+        case serbian = "sr"
+        case serboCroatian = "sh"
+        case sesotho = "st"
+        case setswana = "tn"
+        case shona = "sn"
+        case sindhi = "sd"
+        case sinhalese = "si"
+        case siswati, swati = "ss"
+        case slovak = "sk"
+        case slovenian = "sl"
+        case somali = "so"
+        case southernNdebele = "nr"
+        case spanish = "es"
+        case sundanese = "su"
+        case swahili, kiswahili = "sw"
+        case swedish = "sv"
+        case tagalog = "tl"
+        case tahitian = "ty"
+        case tajik = "tg"
+        case tamil = "ta"
+        case tatar = "tt"
+        case telugu = "te"
+        case thai = "th"
+        case tibetan = "bo"
+        case tigrinya = "ti"
+        case tonga = "to"
+        case tsonga = "ts"
+        case turkish = "tr"
+        case turkmen = "tk"
+        case twi = "tw"
+        case uyghur = "ug"
+        case ukrainian = "uk"
+        case urdu = "ur"
+        case uzbek = "uz"
+        case venda = "ve"
+        case vietnamese = "vi"
+        case volapük = "vo"
+        case wallon = "wa"
+        case welsh = "cy"
+        case wolof = "wo"
+        case westernFrisian = "fy"
+        case xhosa = "xh"
+        case yiddish = "yi, ji"
+        case yoruba = "yo"
+        case zhuang, Chuang = "za"
+        case zulu = "zu"
+    }
+}

From 66ee00cf1865156dfb373494c29792486ad7e8f4 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:38:58 -0400
Subject: [PATCH 113/141] Fiddling with Head

---
 Sources/SwiftHtml/Tags/Head.swift | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index 91c5112..e56fe3b 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -25,21 +25,21 @@ open class Head: StandardTag {
     override open class var name: String { .init(describing: Head.self).lowercased() }
     
     public convenience init(title: Title? = nil,
-                            @TagBuilder style: () -> [Style],
-                            @TagBuilder base: () -> [Base],
-                            @TagBuilder link: () -> [Link],
-                            @TagBuilder meta: () -> [Meta],
-                            @TagBuilder script: () -> [Script],
-                            @TagBuilder noscript: () -> [Noscript],
+                            @TagBuilder style: () -> [Style]?,
+                            @TagBuilder base: () -> [Base]?,
+                            @TagBuilder link: () -> [Link]?,
+                            @TagBuilder meta: () -> [Meta]?,
+                            @TagBuilder script: () -> [Script]?,
+                            @TagBuilder noscript: () -> [Noscript]?,
                             @TagBuilder _ builder: () -> Tag) {
         let temp = Tag {
             title != nil ? [title!] : []
-            style()
-            base()
-            link()
-            meta()
-            script()
-            noscript()
+            style() ?? []
+            base() ?? []
+            link() ?? []
+            meta() ?? []
+            script() ?? []
+            noscript() ?? []
             [builder()]
         }
         self.init(name: Self.name, temp.children)

From 3b6bc7d464f2fefdf4a81d5566941d6ed2601960 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:41:33 -0400
Subject: [PATCH 114/141] Revert Head to original

---
 Sources/SwiftHtml/Tags/Head.swift | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index e56fe3b..fb5ba86 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -23,25 +23,4 @@
 open class Head: StandardTag {
     
     override open class var name: String { .init(describing: Head.self).lowercased() }
-    
-    public convenience init(title: Title? = nil,
-                            @TagBuilder style: () -> [Style]?,
-                            @TagBuilder base: () -> [Base]?,
-                            @TagBuilder link: () -> [Link]?,
-                            @TagBuilder meta: () -> [Meta]?,
-                            @TagBuilder script: () -> [Script]?,
-                            @TagBuilder noscript: () -> [Noscript]?,
-                            @TagBuilder _ builder: () -> Tag) {
-        let temp = Tag {
-            title != nil ? [title!] : []
-            style() ?? []
-            base() ?? []
-            link() ?? []
-            meta() ?? []
-            script() ?? []
-            noscript() ?? []
-            [builder()]
-        }
-        self.init(name: Self.name, temp.children)
-    }
 }

From ca875f315ac64b4c2175106a7b2f9b5b7f9c13c2 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 22:06:40 -0400
Subject: [PATCH 115/141] Lang tweaks

---
 Sources/SwiftHtml/Attributes/Global.swift   | 5 -----
 Sources/SwiftHtml/Attributes/Language.swift | 8 ++++++++
 Sources/SwiftHtml/Tags/Html.swift           | 4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Global.swift b/Sources/SwiftHtml/Attributes/Global.swift
index c1265f5..918a588 100644
--- a/Sources/SwiftHtml/Attributes/Global.swift
+++ b/Sources/SwiftHtml/Attributes/Global.swift
@@ -268,11 +268,6 @@ public extension Tag {
         attribute("id", value)
     }
     
-    /// Specifies the language of the element's content
-    func lang(_ value: String) -> Self {
-        attribute("lang", value)
-    }
-    
     /// Specifies whether the element is to have its spelling and grammar checked or not
     func spellcheck(_ value: Bool) -> Self {
         attribute("spellcheck", String(value))
diff --git a/Sources/SwiftHtml/Attributes/Language.swift b/Sources/SwiftHtml/Attributes/Language.swift
index fc9beff..5157f71 100644
--- a/Sources/SwiftHtml/Attributes/Language.swift
+++ b/Sources/SwiftHtml/Attributes/Language.swift
@@ -198,3 +198,11 @@ public extension Attribute {
         case zulu = "zu"
     }
 }
+
+public extension Tag {
+    
+    @discardableResult
+    func lang(_ l: Attribute.Lang, _ condition: Bool = true) -> Self {
+        attribute("lang", l.rawValue)
+    }
+}
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 366e6a6..21b3474 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -20,7 +20,9 @@ open class Html: StandardTag {
                 _ children: [Tag]? = nil) {
         self.lang = lang
         super.init()
-        self.attribute("lang", lang?.rawValue)
+        if let lang = lang {
+            self.lang(lang)
+        }
     }
     
     public convenience init(lang: Attribute.Lang? = nil,

From e6847ca4632bc87509af763956bf24fa50429923 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 26 Jul 2023 22:09:42 -0400
Subject: [PATCH 116/141] More Lang tweaks

---
 Sources/SwiftHtml/Attributes/Language.swift | 5 +++--
 Sources/SwiftHtml/Tags/Html.swift           | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Language.swift b/Sources/SwiftHtml/Attributes/Language.swift
index 5157f71..bc3727f 100644
--- a/Sources/SwiftHtml/Attributes/Language.swift
+++ b/Sources/SwiftHtml/Attributes/Language.swift
@@ -202,7 +202,8 @@ public extension Attribute {
 public extension Tag {
     
     @discardableResult
-    func lang(_ l: Attribute.Lang, _ condition: Bool = true) -> Self {
-        attribute("lang", l.rawValue)
+    func lang(_ l: Attribute.Lang?, _ condition: Bool = true) -> Self {
+        guard let l = l, condition else { return self }
+        return attribute("lang", l.rawValue)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 21b3474..6d26d1a 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -20,9 +20,7 @@ open class Html: StandardTag {
                 _ children: [Tag]? = nil) {
         self.lang = lang
         super.init()
-        if let lang = lang {
-            self.lang(lang)
-        }
+        self.lang(lang)
     }
     
     public convenience init(lang: Attribute.Lang? = nil,

From 9ca13b9a7abf483105d0e147d50954fe34ef11a0 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 06:04:58 -0400
Subject: [PATCH 117/141] More Lang tweaks

---
 Sources/SwiftHtml/Attributes/{Language.swift => Lang.swift} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Sources/SwiftHtml/Attributes/{Language.swift => Lang.swift} (100%)

diff --git a/Sources/SwiftHtml/Attributes/Language.swift b/Sources/SwiftHtml/Attributes/Lang.swift
similarity index 100%
rename from Sources/SwiftHtml/Attributes/Language.swift
rename to Sources/SwiftHtml/Attributes/Lang.swift

From 6895a016467becbf752d202bdafd31f091da5810 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 10:00:49 -0400
Subject: [PATCH 118/141] Head convenience init() Minor tweaks

---
 Sources/SwiftHtml/Tags/Head.swift | 21 +++++++++++++++++++++
 Sources/SwiftSgml/Tag.swift       |  2 +-
 Sources/SwiftSgml/TagKind.swift   |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Sources/SwiftHtml/Tags/Head.swift b/Sources/SwiftHtml/Tags/Head.swift
index fb5ba86..69d95e4 100644
--- a/Sources/SwiftHtml/Tags/Head.swift
+++ b/Sources/SwiftHtml/Tags/Head.swift
@@ -20,7 +20,28 @@
 /// - `<meta>`
 /// - `<script>`
 /// - `<noscript>`
+
 open class Head: StandardTag {
     
     override open class var name: String { .init(describing: Head.self).lowercased() }
+    
+    public convenience init(title: Title? = nil,
+                            styles: [Style] = [],
+                            bases: [Base] = [],
+                            links: [Link] = [],
+                            metas: [Meta] = [],
+                            scripts: [Script] = [],
+                            noscripts: [Noscript] = [],
+                            @TagBuilder _ builder: () -> Tag) {
+        self.init(name: Self.name) {
+            title != nil ? [title!] : []
+            styles
+            bases
+            links
+            metas
+            scripts
+            noscripts
+            [builder()]
+        }
+    }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 1a3b48b..63681ce 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -17,7 +17,7 @@ open class Tag {
     
     public let kind: Kind?    // == nil only children rendered
     public let name: String
-    public var contents: String?
+    public private(set) var contents: String?
     public internal(set) var attributes: [Attribute]?
     public private(set) var children: [Tag]?
     
diff --git a/Sources/SwiftSgml/TagKind.swift b/Sources/SwiftSgml/TagKind.swift
index 062f395..b0207dd 100644
--- a/Sources/SwiftSgml/TagKind.swift
+++ b/Sources/SwiftSgml/TagKind.swift
@@ -5,6 +5,8 @@
 //  Created by Brad Gourley on 7/12/23.
 //
 
+// Unifies init code for all superclasses of a particular Tag Kind
+
 open class TagKind: Tag {
     
     public init(name: String? = nil,

From eb252e6fde2f4c7d223cd503f228f88ebe92de33 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 11:02:58 -0400
Subject: [PATCH 119/141] Minor Tweaks

---
 Sources/SwiftHtml/Attributes/Events.swift |  4 ++--
 Sources/SwiftHtml/Tags/Body.swift         | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index bc29774..e95d1b6 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -7,8 +7,6 @@
 
 public extension Attribute {
     
-    typealias JSFunction = String
-    
     enum Event: String {
         // Windows
         case afterPrint       // Script to be run after the document is printed
@@ -90,6 +88,8 @@ public extension Attribute {
         case toggle           // Fires when the user opens or closes the <details> element
     }
     
+    typealias JSFunction = String
+    
     struct EventFunction {
         let event: Event
         let function: JSFunction
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 7636836..21b76b9 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -14,13 +14,13 @@ open class Body: StandardTag {
     
     override open class var name: String { .init(describing: Body.self).lowercased() }
     
-    public private(set) var scripts: [Script]?
-    public private(set) var eventFunctions: [Attribute.EventFunction]?
+    public private(set) var scripts: [Script]
+    public private(set) var eventFunctions: [Attribute.EventFunction]
     
-    public init(scripts: [Script]? = nil,
-                eventFunctions: [Attribute.EventFunction]? = nil,
+    public init(scripts: [Script] = [],
+                eventFunctions: [Attribute.EventFunction] = [],
                 _ children: [Tag]? = nil) {
-        self.scripts = scripts ?? []
+        self.scripts = scripts
         self.eventFunctions = eventFunctions
         let temp = Tag {
             if let children = children { children }
@@ -31,7 +31,7 @@ open class Body: StandardTag {
     }
     
     public convenience init(scripts: [Script] = [],
-                            eventFunctions: [Attribute.EventFunction]? = nil,
+                            eventFunctions: [Attribute.EventFunction] = [],
                             @TagBuilder _ builder: () -> Tag) {
         self.init(scripts: scripts,
                   eventFunctions: eventFunctions,

From 8f3086299a907172b0a345b2a334bc5f62847f21 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 11:05:31 -0400
Subject: [PATCH 120/141] Minor Tweaks

---
 Sources/SwiftHtml/Tags/Body.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 21b76b9..6cb29eb 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -23,8 +23,8 @@ open class Body: StandardTag {
         self.scripts = scripts
         self.eventFunctions = eventFunctions
         let temp = Tag {
-            if let children = children { children }
-            if let scripts = scripts { scripts }
+            children ?? []
+            scripts
         }
         super.init(temp.children)
         self.onEvents(eventFunctions)

From 5960b77266485187b6abe5e274d0d6a002f50b02 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 12:17:27 -0400
Subject: [PATCH 121/141] Language + Country

---
 Sources/SwiftHtml/Attributes/Lang.swift | 250 +++++++++++++++++++++++-
 Sources/SwiftHtml/Tags/Body.swift       |  13 +-
 Sources/SwiftHtml/Tags/Html.swift       |  10 +-
 3 files changed, 260 insertions(+), 13 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Lang.swift b/Sources/SwiftHtml/Attributes/Lang.swift
index bc3727f..127850b 100644
--- a/Sources/SwiftHtml/Attributes/Lang.swift
+++ b/Sources/SwiftHtml/Attributes/Lang.swift
@@ -197,13 +197,259 @@ public extension Attribute {
         case zhuang, Chuang = "za"
         case zulu = "zu"
     }
+    
+    enum Country: String {
+        case afghanistan = "AF"
+        case albania = "AL"
+        case algeria = "DZ"
+        case americanSamoa = "AS"
+        case andorra = "AD"
+        case angola = "AO"
+        case antarctica = "AQ"
+        case antiguaAndBarbuda = "AG"
+        case argentina = "AR"
+        case armenia = "AM"
+        case aruba = "AW"
+        case australia = "AU"
+        case austria = "AT"
+        case azerbaijan = "AZ"
+        case bahamas = "BS"
+        case bahrain = "BH"
+        case bangladesh = "BD"
+        case barbados = "BB"
+        case belarus = "BY"
+        case belgium = "BE"
+        case belize = "BZ"
+        case benin = "BJ"
+        case bermuda = "BM"
+        case bhutan = "BT"
+        case bolivia = "BO"
+        case bosniaAndHerzegovina = "BA"
+        case botswana = "BW"
+        case bouvetIsland = "BV"
+        case brazil = "BR"
+        case britishIndianOceanTerritory = "IO"
+        case bruneiDarussalam = "BN"
+        case bulgaria = "BG"
+        case burkinaFaso = "BF"
+        case burundi = "BI"
+        case cambodia = "KH"
+        case cameroon = "CM"
+        case canada = "CA"
+        case capeVerde = "CV"
+        case caymanIslands = "KY"
+        case centralAfricanRepublic = "CF"
+        case chad = "TD"
+        case chile = "CL"
+        case china = "CN"
+        case christmasIsland = "CX"
+        case cocosKeelingIslands = "CC"
+        case colombia = "CO"
+        case comoros = "KM"
+        case congo = "CG"
+        case congoTheDemocraticRepublicOfThe = "CD"
+        case cookIslands = "CK"
+        case costaRica = "CR"
+        case côteDivoire = "CI"
+        case croatia = "HR"
+        case cuba = "CU"
+        case cyprus = "CY"
+        case czechRepublic = "CZ"
+        case denmark = "DK"
+        case djibouti = "DJ"
+        case dominica = "DM"
+        case dominicanRepublic = "DO"
+        case ecuador = "EC"
+        case egypt = "EG"
+        case elSalvador = "SV"
+        case equatorialGuinea = "GQ"
+        case eritrea = "ER"
+        case estonia = "EE"
+        case ethiopia = "ET"
+        case falklandIslandsMalvinas = "FK"
+        case faroeIslands = "FO"
+        case fiji = "FJ"
+        case finland = "FI"
+        case france = "FR"
+        case frenchGuiana = "GF"
+        case frenchPolynesia = "PF"
+        case frenchSouthernTerritories = "TF"
+        case gabon = "GA"
+        case gambia = "GM"
+        case georgia = "GE"
+        case germany = "DE"
+        case ghana = "GH"
+        case gibraltar = "GI"
+        case greece = "GR"
+        case greenland = "GL"
+        case grenada = "GD"
+        case guadeloupe = "GP"
+        case guam = "GU"
+        case guatemala = "GT"
+        case guinea = "GN"
+        case guineaBissau = "GW"
+        case guyana = "GY"
+        case haiti = "HT"
+        case heardIslandAndMcdonaldIslands = "HM"
+        case honduras = "HN"
+        case hongKong = "HK"
+        case hungary = "HU"
+        case iceland = "IS"
+        case india = "IN"
+        case indonesia = "ID"
+        case iranIslamicRepublicOf = "IR"
+        case iraq = "IQ"
+        case ireland = "IE"
+        case israel = "IL"
+        case italy = "IT"
+        case jamaica = "JM"
+        case japan = "JP"
+        case jordan = "JO"
+        case kazakhstan = "KZ"
+        case kenya = "KE"
+        case kiribati = "KI"
+        case koreaDemocraticPeoplesRepublicOf = "KP"
+        case koreaRepublicOf = "KR"
+        case kuwait = "KW"
+        case kyrgyzstan = "KG"
+        case laoPeoplesDemocraticRepublicLaos = "LA"
+        case latvia = "LV"
+        case lebanon = "LB"
+        case lesotho = "LS"
+        case liberia = "LR"
+        case libyaStateOf = "LY"
+        case liechtenstein = "LI"
+        case lithuania = "LT"
+        case luxembourg = "LU"
+        case macao = "MO"
+        case macedoniaTheFormerYugoslavRepublicOf = "MK"
+        case madagascar = "MG"
+        case malawi = "MW"
+        case malaysia = "MY"
+        case maldives = "MV"
+        case mali = "ML"
+        case malta = "MT"
+        case marshallIslands = "MH"
+        case martinique = "MQ"
+        case mauritania = "MR"
+        case mauritius = "MU"
+        case mayotte = "YT"
+        case mexico = "MX"
+        case micronesiaFederatedStatesOf = "FM"
+        case moldovaRepublicOf = "MD"
+        case monaco = "MC"
+        case mongolia = "MN"
+        case montenegro = "ME"
+        case montserrat = "MS"
+        case morocco = "MA"
+        case mozambique = "MZ"
+        case myanmar = "MM"
+        case namibia = "NA"
+        case nauru = "NR"
+        case nepalFederalDemocraticRepublicOf = "NP"
+        case netherlands = "NL"
+        case netherlandsAntilles = "AN"
+        case newCaledonia = "NC"
+        case newZealand = "NZ"
+        case nicaragua = "NI"
+        case niger = "NE"
+        case nigeria = "NG"
+        case niue = "NU"
+        case norfolkIsland = "NF"
+        case northernMarianaIslands = "MP"
+        case norway = "NO"
+        case oman = "OM"
+        case pakistan = "PK"
+        case palau = "PW"
+        case palestineStateOf = "PS"
+        case panama = "PA"
+        case papuaNewGuinea = "PG"
+        case paraguay = "PY"
+        case peru = "PE"
+        case philippines = "PH"
+        case pitcairn = "PN"
+        case poland = "PL"
+        case portugal = "PT"
+        case puertoRico = "PR"
+        case qatar = "QA"
+        case réunion = "RE"
+        case romania = "RO"
+        case russianFederation = "RU"
+        case rwanda = "RW"
+        case saintHelena = "SH"
+        case saintKittsAndNevis = "KN"
+        case saintLucia = "LC"
+        case saintPierreAndMiquelon = "PM"
+        case saintVincentAndTheGrenadines = "VC"
+        case samoa = "WS"
+        case sanMarino = "SM"
+        case saoTomeAndPrincipe = "ST"
+        case saudiArabia = "SA"
+        case senegal = "SN"
+        case serbia = "RS"
+        case seychelles = "SC"
+        case sierraLeone = "SL"
+        case singapore = "SG"
+        case slovakia = "SK"
+        case slovenia = "SI"
+        case solomonIslands = "SB"
+        case somalia = "SO"
+        case southAfrica = "ZA"
+        case southGeorgiaAndTheSouthSandwichIslands = "GS"
+        case southSudan = "SS"
+        case spain = "ES"
+        case sriLanka = "LK"
+        case sudan = "SD"
+        case suriname = "SR"
+        case svalbardAndJanMayen = "SJ"
+        case swaziland = "SZ"
+        case sweden = "SE"
+        case switzerland = "CH"
+        case syrianArabRepublic = "SY"
+        case taiwan = "TW"
+        case tajikistan = "TJ"
+        case tanzaniaUnitedRepublicOf = "TZ"
+        case thailand = "TH"
+        case timorLeste = "TL"
+        case togo = "TG"
+        case tokelau = "TK"
+        case tonga = "TO"
+        case trinidadAndTobago = "TT"
+        case tunisia = "TN"
+        case turkey = "TR"
+        case turkmenistan = "TM"
+        case turksAndCaicosIslands = "TC"
+        case tuvalu = "TV"
+        case uganda = "UG"
+        case ukraine = "UA"
+        case unitedArabEmirates = "AE"
+        case unitedKingdom = "GB"
+        case unitedStates = "US"
+        case unitedStatesMinorOutlyingIslands = "UM"
+        case uruguay = "UY"
+        case uzbekistan = "UZ"
+        case vanuatu = "VU"
+        case venezuela = "VE"
+        case vietNam = "VN"
+        case virginIslandsBritish = "VG"
+        case virginIslandsUs = "VI"
+        case wallisAndFutuna = "WF"
+        case westernSahara = "EH"
+        case yemen = "YE"
+        case zambia = "ZM"
+        case zimbabwe = "ZW"
+    }
 }
 
 public extension Tag {
     
     @discardableResult
-    func lang(_ l: Attribute.Lang?, _ condition: Bool = true) -> Self {
+    func lang(_ l: Attribute.Lang?, _ country: Attribute.Country? = nil, _ condition: Bool = true) -> Self {
         guard let l = l, condition else { return self }
-        return attribute("lang", l.rawValue)
+        var value = l.rawValue
+        if let country = country {
+            value += "-\(country.rawValue)"
+        }
+        return attribute("lang", value)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 6cb29eb..111b059 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -14,19 +14,14 @@ open class Body: StandardTag {
     
     override open class var name: String { .init(describing: Body.self).lowercased() }
     
-    public private(set) var scripts: [Script]
-    public private(set) var eventFunctions: [Attribute.EventFunction]
-    
-    public init(scripts: [Script] = [],
-                eventFunctions: [Attribute.EventFunction] = [],
-                _ children: [Tag]? = nil) {
-        self.scripts = scripts
-        self.eventFunctions = eventFunctions
+    public convenience init(scripts: [Script] = [],
+                            eventFunctions: [Attribute.EventFunction] = [],
+                            _ children: [Tag]? = nil) {
         let temp = Tag {
             children ?? []
             scripts
         }
-        super.init(temp.children)
+        self.init(attributes: nil, temp.children)   // attributes parameter included to disambiguate init()
         self.onEvents(eventFunctions)
     }
     
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 6d26d1a..53cfcb9 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -15,17 +15,23 @@ open class Html: StandardTag {
     override open class var name: String { .init(describing: Html.self).lowercased() }
     
     public private(set) var lang: Attribute.Lang?
+    public private(set) var country: Attribute.Country?
     
     public init(lang: Attribute.Lang? = nil,
+                country: Attribute.Country? = nil,
                 _ children: [Tag]? = nil) {
         self.lang = lang
+        self.country = country
         super.init()
-        self.lang(lang)
+        self.lang(lang, country)
     }
     
     public convenience init(lang: Attribute.Lang? = nil,
+                            country: Attribute.Country? = nil,
                             @TagBuilder _ builder: () -> Tag) {
-        self.init(lang: lang, [builder()])
+        self.init(lang: lang,
+                  country: country,
+                  [builder()])
     }
 }
 

From 7b9d3b122712d6f04934de5f5b6bb8014c12bd9f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 12:18:39 -0400
Subject: [PATCH 122/141] Language + Country

---
 Sources/SwiftHtml/Attributes/Lang.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/SwiftHtml/Attributes/Lang.swift b/Sources/SwiftHtml/Attributes/Lang.swift
index 127850b..0358d5e 100644
--- a/Sources/SwiftHtml/Attributes/Lang.swift
+++ b/Sources/SwiftHtml/Attributes/Lang.swift
@@ -198,6 +198,7 @@ public extension Attribute {
         case zulu = "zu"
     }
     
+    // source https://www.w3schools.com/tags/ref_country_codes.asp
     enum Country: String {
         case afghanistan = "AF"
         case albania = "AL"

From 3f228779ce825dadd710a60c467bbadfddad64fe Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 12:26:55 -0400
Subject: [PATCH 123/141] struct Lang

---
 Sources/SwiftHtml/Attributes/Lang.swift | 22 +++++++++++++++-------
 Sources/SwiftHtml/Tags/Html.swift       |  7 +------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Lang.swift b/Sources/SwiftHtml/Attributes/Lang.swift
index 0358d5e..98154c2 100644
--- a/Sources/SwiftHtml/Attributes/Lang.swift
+++ b/Sources/SwiftHtml/Attributes/Lang.swift
@@ -8,7 +8,7 @@
 public extension Attribute {
     
     // source https://www.w3schools.com/tags/ref_language_codes.asp
-    enum Lang: String {
+    enum Language: String {
         case abkhazian = "ab"
         case afar = "aa"
         case afrikaans = "af"
@@ -440,17 +440,25 @@ public extension Attribute {
         case zambia = "ZM"
         case zimbabwe = "ZW"
     }
+    
+    struct Lang {
+        let language: Language
+        let country: Country?
+        
+        var rawValue: String {
+            guard let country = country else {
+                return language.rawValue
+            }
+            return language.rawValue + "-\(country.rawValue)"
+        }
+    }
 }
 
 public extension Tag {
     
     @discardableResult
-    func lang(_ l: Attribute.Lang?, _ country: Attribute.Country? = nil, _ condition: Bool = true) -> Self {
+    func lang(_ l: Attribute.Lang?, _ condition: Bool = true) -> Self {
         guard let l = l, condition else { return self }
-        var value = l.rawValue
-        if let country = country {
-            value += "-\(country.rawValue)"
-        }
-        return attribute("lang", value)
+        return attribute("lang", l.rawValue)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index 53cfcb9..a852ada 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -15,22 +15,17 @@ open class Html: StandardTag {
     override open class var name: String { .init(describing: Html.self).lowercased() }
     
     public private(set) var lang: Attribute.Lang?
-    public private(set) var country: Attribute.Country?
     
     public init(lang: Attribute.Lang? = nil,
-                country: Attribute.Country? = nil,
                 _ children: [Tag]? = nil) {
         self.lang = lang
-        self.country = country
         super.init()
-        self.lang(lang, country)
+        self.lang(lang)
     }
     
     public convenience init(lang: Attribute.Lang? = nil,
-                            country: Attribute.Country? = nil,
                             @TagBuilder _ builder: () -> Tag) {
         self.init(lang: lang,
-                  country: country,
                   [builder()])
     }
 }

From f98d517e682a53c5a07fe020f4abadc4ddd643f2 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 12:32:49 -0400
Subject: [PATCH 124/141] struct Lang

---
 Sources/SwiftHtml/Attributes/Lang.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Sources/SwiftHtml/Attributes/Lang.swift b/Sources/SwiftHtml/Attributes/Lang.swift
index 98154c2..0cd3691 100644
--- a/Sources/SwiftHtml/Attributes/Lang.swift
+++ b/Sources/SwiftHtml/Attributes/Lang.swift
@@ -445,6 +445,11 @@ public extension Attribute {
         let language: Language
         let country: Country?
         
+        public init(_ language: Language, _ country: Country? = nil) {
+            self.language = language
+            self.country = country
+        }
+        
         var rawValue: String {
             guard let country = country else {
                 return language.rawValue

From 7497f09e7bb5245fb2663a290314b03d07d83852 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 13:12:07 -0400
Subject: [PATCH 125/141] Shortened Language and Country enum names

---
 Sources/SwiftHtml/Attributes/Lang.swift | 863 ++++++++++++------------
 1 file changed, 436 insertions(+), 427 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Lang.swift b/Sources/SwiftHtml/Attributes/Lang.swift
index 0cd3691..aee16d5 100644
--- a/Sources/SwiftHtml/Attributes/Lang.swift
+++ b/Sources/SwiftHtml/Attributes/Lang.swift
@@ -9,436 +9,438 @@ public extension Attribute {
     
     // source https://www.w3schools.com/tags/ref_language_codes.asp
     enum Language: String {
-        case abkhazian = "ab"
-        case afar = "aa"
-        case afrikaans = "af"
-        case akan = "ak"
-        case albanian = "sq"
-        case amharic = "am"
-        case arabic = "ar"
-        case aragonese = "an"
-        case armenian = "hy"
-        case assamese = "as"
-        case avaric = "av"
-        case avestan = "ae"
-        case aymara = "ay"
-        case azerbaijani = "az"
-        case bambara = "bm"
-        case bashkir = "ba"
-        case basque = "eu"
-        case belarusian = "be"
-        case bengali, bangla = "bn"
-        case bihari = "bh"
-        case bislama = "bi"
-        case bosnian = "bs"
-        case breton = "br"
-        case bulgarian = "bg"
-        case burmese = "my"
-        case catalan = "ca"
-        case chamorro = "ch"
-        case chechen = "ce"
-        case chichewa, Chewa, Nyanja = "ny"
-        case chinese = "zh"
-        case chineseSimplified = "zh-Hans"
-        case chineseTraditional = "zh-Hant"
-        case chuvash = "cv"
-        case cornish = "kw"
-        case corsican = "co"
-        case cree = "cr"
-        case croatian = "hr"
-        case czech = "cs"
-        case danish = "da"
-        case divehi, Dhivehi, Maldivian = "dv"
-        case dutch = "nl"
-        case dzongkha = "dz"
-        case english = "en"
-        case esperanto = "eo"
-        case estonian = "et"
-        case ewe = "ee"
-        case faroese = "fo"
-        case fijian = "fj"
-        case finnish = "fi"
-        case french = "fr"
-        case fula, Fulah, Pulaar, Pular = "ff"
-        case galician = "gl"
-        case gaelicScottish = "gd"
-        case georgian = "ka"
-        case german = "de"
-        case greek = "el"
-        case greenlandic, kalaallisut = "kl"
-        case guarani = "gn"
-        case gujarati = "gu"
-        case haitianCreole = "ht"
-        case hausa = "ha"
-        case hebrew = "he"
-        case herero = "hz"
-        case hindi = "hi"
-        case hiriMotu = "ho"
-        case hungarian = "hu"
-        case icelandic = "is"
-        case ido = "io"
-        case igbo = "ig"
-        case indonesian = "id, in"
-        case interlingua = "ia"
-        case interlingue = "ie"
-        case inuktitut = "iu"
-        case inupiak = "ik"
-        case irish = "ga"
-        case italian = "it"
-        case japanese = "ja"
-        case javanese = "jv"
-        case kannada = "kn"
-        case kanuri = "kr"
-        case kashmiri = "ks"
-        case kazakh = "kk"
-        case khmer = "km"
-        case kikuyu = "ki"
-        case kinyarwanda, rwanda = "rw"
-        case kirundi = "rn"
-        case kyrgyz = "ky"
-        case komi = "kv"
-        case kongo = "kg"
-        case korean = "ko"
-        case kurdish = "ku"
-        case kwanyama = "kj"
-        case lao = "lo"
-        case latin = "la"
-        case latvian, lettish = "lv"
-        case limburgish, limburger = "li"
-        case lingala = "ln"
-        case lithuanian = "lt"
-        case lugaKatanga = "lu"
-        case luganda, Ganda = "lg"
-        case luxembourgish = "lb"
-        case manx = "gv"
-        case macedonian = "mk"
-        case malagasy = "mg"
-        case malay = "ms"
-        case malayalam = "ml"
-        case maltese = "mt"
-        case maori = "mi"
-        case marathi = "mr"
-        case marshallese = "mh"
-        case moldavian = "mo"
-        case mongolian = "mn"
-        case nauru = "na"
-        case navajo = "nv"
-        case ndonga = "ng"
-        case northernNdebele = "nd"
-        case nepali = "ne"
-        case norwegian = "no"
-        case norwegianBokmål = "nb"
-        case norwegianNynorsk = "nn"
-        case nuosu, sichuanYi = "ii"
-        case occitan = "oc"
-        case ojibwe = "oj"
-        case oldChurchSlavonic, oldBulgarian = "cu"
-        case oriya = "or"
-        case oromo, afaanOromo = "om"
-        case ossetian = "os"
-        case pāli = "pi"
-        case pashto, Pushto = "ps"
-        case persian, farsi = "fa"
-        case polish = "pl"
-        case portuguese = "pt"
-        case punjabiEastern = "pa"
-        case quechua = "qu"
-        case romansh = "rm"
-        case romanian = "ro"
-        case russian = "ru"
-        case sami = "se"
-        case samoan = "sm"
-        case sango = "sg"
-        case sanskrit = "sa"
-        case serbian = "sr"
-        case serboCroatian = "sh"
-        case sesotho = "st"
-        case setswana = "tn"
-        case shona = "sn"
-        case sindhi = "sd"
-        case sinhalese = "si"
-        case siswati, swati = "ss"
-        case slovak = "sk"
-        case slovenian = "sl"
-        case somali = "so"
-        case southernNdebele = "nr"
-        case spanish = "es"
-        case sundanese = "su"
-        case swahili, kiswahili = "sw"
-        case swedish = "sv"
-        case tagalog = "tl"
-        case tahitian = "ty"
-        case tajik = "tg"
-        case tamil = "ta"
-        case tatar = "tt"
-        case telugu = "te"
-        case thai = "th"
-        case tibetan = "bo"
-        case tigrinya = "ti"
-        case tonga = "to"
-        case tsonga = "ts"
-        case turkish = "tr"
-        case turkmen = "tk"
-        case twi = "tw"
-        case uyghur = "ug"
-        case ukrainian = "uk"
-        case urdu = "ur"
-        case uzbek = "uz"
-        case venda = "ve"
-        case vietnamese = "vi"
-        case volapük = "vo"
-        case wallon = "wa"
-        case welsh = "cy"
-        case wolof = "wo"
-        case westernFrisian = "fy"
-        case xhosa = "xh"
-        case yiddish = "yi, ji"
-        case yoruba = "yo"
-        case zhuang, Chuang = "za"
-        case zulu = "zu"
+        case ab
+        case aa
+        case af
+        case ak
+        case sq
+        case am
+        case ar
+        case an
+        case hy
+        case `as`
+        case av
+        case ae
+        case ay
+        case az
+        case bm
+        case ba
+        case eu
+        case be
+        case bn
+        case bh
+        case bi
+        case bs
+        case br
+        case bg
+        case my
+        case ca
+        case ch
+        case ce
+        case ny
+        case zh
+        case zhHans = "zh-Hans"
+        case zhHant = "zh-Hant"
+        case cv
+        case kw
+        case co
+        case cr
+        case hr
+        case cs
+        case da
+        case dv
+        case nl
+        case dz
+        case en
+        case eo
+        case et
+        case ee
+        case fo
+        case fj
+        case fi
+        case fr
+        case ff
+        case gl
+        case gd
+        case gv
+        case ka
+        case de
+        case el
+        case kl
+        case gn
+        case gu
+        case ht
+        case ha
+        case he
+        case hz
+        case hi
+        case ho
+        case hu
+        case `is`
+        case io
+        case ig
+        case id
+        case `in`
+        case ia
+        case ie
+        case iu
+        case ik
+        case ga
+        case it
+        case ja
+        case jv
+        case kn
+        case kr
+        case ks
+        case kk
+        case km
+        case ki
+        case rw
+        case rn
+        case ky
+        case kv
+        case kg
+        case ko
+        case ku
+        case kj
+        case lo
+        case la
+        case lv
+        case li
+        case ln
+        case lt
+        case lu
+        case lg
+        case lb
+        case mk
+        case mg
+        case ms
+        case ml
+        case mt
+        case mi
+        case mr
+        case mh
+        case mo
+        case mn
+        case na
+        case nv
+        case ng
+        case nd
+        case ne
+        case no
+        case nb
+        case nn
+        case ii
+        case oc
+        case oj
+        case cu
+        case or
+        case om
+        case os
+        case pi
+        case ps
+        case fa
+        case pl
+        case pt
+        case pa
+        case qu
+        case rm
+        case ro
+        case ru
+        case se
+        case sm
+        case sg
+        case sa
+        case sr
+        case sh
+        case st
+        case tn
+        case sn
+        case sd
+        case si
+        case ss
+        case sk
+        case sl
+        case so
+        case nr
+        case es
+        case su
+        case sw
+        case sv
+        case tl
+        case ty
+        case tg
+        case ta
+        case tt
+        case te
+        case th
+        case bo
+        case ti
+        case to
+        case ts
+        case tr
+        case tk
+        case tw
+        case ug
+        case uk
+        case ur
+        case uz
+        case ve
+        case vi
+        case vo
+        case wa
+        case cy
+        case wo
+        case fy
+        case xh
+        case yi
+        case yo
+        case za
+        case zu
+        case ji
     }
     
     // source https://www.w3schools.com/tags/ref_country_codes.asp
     enum Country: String {
-        case afghanistan = "AF"
-        case albania = "AL"
-        case algeria = "DZ"
-        case americanSamoa = "AS"
-        case andorra = "AD"
-        case angola = "AO"
-        case antarctica = "AQ"
-        case antiguaAndBarbuda = "AG"
-        case argentina = "AR"
-        case armenia = "AM"
-        case aruba = "AW"
-        case australia = "AU"
-        case austria = "AT"
-        case azerbaijan = "AZ"
-        case bahamas = "BS"
-        case bahrain = "BH"
-        case bangladesh = "BD"
-        case barbados = "BB"
-        case belarus = "BY"
-        case belgium = "BE"
-        case belize = "BZ"
-        case benin = "BJ"
-        case bermuda = "BM"
-        case bhutan = "BT"
-        case bolivia = "BO"
-        case bosniaAndHerzegovina = "BA"
-        case botswana = "BW"
-        case bouvetIsland = "BV"
-        case brazil = "BR"
-        case britishIndianOceanTerritory = "IO"
-        case bruneiDarussalam = "BN"
-        case bulgaria = "BG"
-        case burkinaFaso = "BF"
-        case burundi = "BI"
-        case cambodia = "KH"
-        case cameroon = "CM"
-        case canada = "CA"
-        case capeVerde = "CV"
-        case caymanIslands = "KY"
-        case centralAfricanRepublic = "CF"
-        case chad = "TD"
-        case chile = "CL"
-        case china = "CN"
-        case christmasIsland = "CX"
-        case cocosKeelingIslands = "CC"
-        case colombia = "CO"
-        case comoros = "KM"
-        case congo = "CG"
-        case congoTheDemocraticRepublicOfThe = "CD"
-        case cookIslands = "CK"
-        case costaRica = "CR"
-        case côteDivoire = "CI"
-        case croatia = "HR"
-        case cuba = "CU"
-        case cyprus = "CY"
-        case czechRepublic = "CZ"
-        case denmark = "DK"
-        case djibouti = "DJ"
-        case dominica = "DM"
-        case dominicanRepublic = "DO"
-        case ecuador = "EC"
-        case egypt = "EG"
-        case elSalvador = "SV"
-        case equatorialGuinea = "GQ"
-        case eritrea = "ER"
-        case estonia = "EE"
-        case ethiopia = "ET"
-        case falklandIslandsMalvinas = "FK"
-        case faroeIslands = "FO"
-        case fiji = "FJ"
-        case finland = "FI"
-        case france = "FR"
-        case frenchGuiana = "GF"
-        case frenchPolynesia = "PF"
-        case frenchSouthernTerritories = "TF"
-        case gabon = "GA"
-        case gambia = "GM"
-        case georgia = "GE"
-        case germany = "DE"
-        case ghana = "GH"
-        case gibraltar = "GI"
-        case greece = "GR"
-        case greenland = "GL"
-        case grenada = "GD"
-        case guadeloupe = "GP"
-        case guam = "GU"
-        case guatemala = "GT"
-        case guinea = "GN"
-        case guineaBissau = "GW"
-        case guyana = "GY"
-        case haiti = "HT"
-        case heardIslandAndMcdonaldIslands = "HM"
-        case honduras = "HN"
-        case hongKong = "HK"
-        case hungary = "HU"
-        case iceland = "IS"
-        case india = "IN"
-        case indonesia = "ID"
-        case iranIslamicRepublicOf = "IR"
-        case iraq = "IQ"
-        case ireland = "IE"
-        case israel = "IL"
-        case italy = "IT"
-        case jamaica = "JM"
-        case japan = "JP"
-        case jordan = "JO"
-        case kazakhstan = "KZ"
-        case kenya = "KE"
-        case kiribati = "KI"
-        case koreaDemocraticPeoplesRepublicOf = "KP"
-        case koreaRepublicOf = "KR"
-        case kuwait = "KW"
-        case kyrgyzstan = "KG"
-        case laoPeoplesDemocraticRepublicLaos = "LA"
-        case latvia = "LV"
-        case lebanon = "LB"
-        case lesotho = "LS"
-        case liberia = "LR"
-        case libyaStateOf = "LY"
-        case liechtenstein = "LI"
-        case lithuania = "LT"
-        case luxembourg = "LU"
-        case macao = "MO"
-        case macedoniaTheFormerYugoslavRepublicOf = "MK"
-        case madagascar = "MG"
-        case malawi = "MW"
-        case malaysia = "MY"
-        case maldives = "MV"
-        case mali = "ML"
-        case malta = "MT"
-        case marshallIslands = "MH"
-        case martinique = "MQ"
-        case mauritania = "MR"
-        case mauritius = "MU"
-        case mayotte = "YT"
-        case mexico = "MX"
-        case micronesiaFederatedStatesOf = "FM"
-        case moldovaRepublicOf = "MD"
-        case monaco = "MC"
-        case mongolia = "MN"
-        case montenegro = "ME"
-        case montserrat = "MS"
-        case morocco = "MA"
-        case mozambique = "MZ"
-        case myanmar = "MM"
-        case namibia = "NA"
-        case nauru = "NR"
-        case nepalFederalDemocraticRepublicOf = "NP"
-        case netherlands = "NL"
-        case netherlandsAntilles = "AN"
-        case newCaledonia = "NC"
-        case newZealand = "NZ"
-        case nicaragua = "NI"
-        case niger = "NE"
-        case nigeria = "NG"
-        case niue = "NU"
-        case norfolkIsland = "NF"
-        case northernMarianaIslands = "MP"
-        case norway = "NO"
-        case oman = "OM"
-        case pakistan = "PK"
-        case palau = "PW"
-        case palestineStateOf = "PS"
-        case panama = "PA"
-        case papuaNewGuinea = "PG"
-        case paraguay = "PY"
-        case peru = "PE"
-        case philippines = "PH"
-        case pitcairn = "PN"
-        case poland = "PL"
-        case portugal = "PT"
-        case puertoRico = "PR"
-        case qatar = "QA"
-        case réunion = "RE"
-        case romania = "RO"
-        case russianFederation = "RU"
-        case rwanda = "RW"
-        case saintHelena = "SH"
-        case saintKittsAndNevis = "KN"
-        case saintLucia = "LC"
-        case saintPierreAndMiquelon = "PM"
-        case saintVincentAndTheGrenadines = "VC"
-        case samoa = "WS"
-        case sanMarino = "SM"
-        case saoTomeAndPrincipe = "ST"
-        case saudiArabia = "SA"
-        case senegal = "SN"
-        case serbia = "RS"
-        case seychelles = "SC"
-        case sierraLeone = "SL"
-        case singapore = "SG"
-        case slovakia = "SK"
-        case slovenia = "SI"
-        case solomonIslands = "SB"
-        case somalia = "SO"
-        case southAfrica = "ZA"
-        case southGeorgiaAndTheSouthSandwichIslands = "GS"
-        case southSudan = "SS"
-        case spain = "ES"
-        case sriLanka = "LK"
-        case sudan = "SD"
-        case suriname = "SR"
-        case svalbardAndJanMayen = "SJ"
-        case swaziland = "SZ"
-        case sweden = "SE"
-        case switzerland = "CH"
-        case syrianArabRepublic = "SY"
-        case taiwan = "TW"
-        case tajikistan = "TJ"
-        case tanzaniaUnitedRepublicOf = "TZ"
-        case thailand = "TH"
-        case timorLeste = "TL"
-        case togo = "TG"
-        case tokelau = "TK"
-        case tonga = "TO"
-        case trinidadAndTobago = "TT"
-        case tunisia = "TN"
-        case turkey = "TR"
-        case turkmenistan = "TM"
-        case turksAndCaicosIslands = "TC"
-        case tuvalu = "TV"
-        case uganda = "UG"
-        case ukraine = "UA"
-        case unitedArabEmirates = "AE"
-        case unitedKingdom = "GB"
-        case unitedStates = "US"
-        case unitedStatesMinorOutlyingIslands = "UM"
-        case uruguay = "UY"
-        case uzbekistan = "UZ"
-        case vanuatu = "VU"
-        case venezuela = "VE"
-        case vietNam = "VN"
-        case virginIslandsBritish = "VG"
-        case virginIslandsUs = "VI"
-        case wallisAndFutuna = "WF"
-        case westernSahara = "EH"
-        case yemen = "YE"
-        case zambia = "ZM"
-        case zimbabwe = "ZW"
+        case af
+        case al
+        case dz
+        case `as`
+        case ad
+        case ao
+        case aq
+        case ag
+        case ar
+        case am
+        case aw
+        case au
+        case at
+        case az
+        case bs
+        case bh
+        case bd
+        case bb
+        case by
+        case be
+        case bz
+        case bj
+        case bm
+        case bt
+        case bo
+        case ba
+        case bw
+        case bv
+        case br
+        case io
+        case bn
+        case bg
+        case bf
+        case bi
+        case kh
+        case cm
+        case ca
+        case cv
+        case ky
+        case cf
+        case td
+        case cl
+        case cn
+        case cx
+        case cc
+        case co
+        case km
+        case cg
+        case cd
+        case ck
+        case cr
+        case ci
+        case hr
+        case cu
+        case cy
+        case cz
+        case dk
+        case dj
+        case dm
+        case `do`
+        case ec
+        case eg
+        case sv
+        case gq
+        case er
+        case ee
+        case et
+        case fk
+        case fo
+        case fj
+        case fi
+        case fr
+        case gf
+        case pf
+        case tf
+        case ga
+        case gm
+        case ge
+        case de
+        case gh
+        case gi
+        case gr
+        case gl
+        case gd
+        case gp
+        case gu
+        case gt
+        case gn
+        case gw
+        case gy
+        case ht
+        case hm
+        case hn
+        case hk
+        case hu
+        case `is`
+        case `in`
+        case id
+        case ir
+        case iq
+        case ie
+        case il
+        case it
+        case jm
+        case jp
+        case jo
+        case kz
+        case ke
+        case ki
+        case kp
+        case kr
+        case kw
+        case kg
+        case la
+        case lv
+        case lb
+        case ls
+        case lr
+        case ly
+        case li
+        case lt
+        case lu
+        case mo
+        case mk
+        case mg
+        case mw
+        case my
+        case mv
+        case ml
+        case mt
+        case mh
+        case mq
+        case mr
+        case mu
+        case yt
+        case mx
+        case fm
+        case md
+        case mc
+        case mn
+        case me
+        case ms
+        case ma
+        case mz
+        case mm
+        case na
+        case nr
+        case np
+        case nl
+        case an
+        case nc
+        case nz
+        case ni
+        case ne
+        case ng
+        case nu
+        case nf
+        case mp
+        case no
+        case om
+        case pk
+        case pw
+        case ps
+        case pa
+        case pg
+        case py
+        case pe
+        case ph
+        case pn
+        case pl
+        case pt
+        case pr
+        case qa
+        case re
+        case ro
+        case ru
+        case rw
+        case sh
+        case kn
+        case lc
+        case pm
+        case vc
+        case ws
+        case sm
+        case st
+        case sa
+        case sn
+        case rs
+        case sc
+        case sl
+        case sg
+        case sk
+        case si
+        case sb
+        case so
+        case za
+        case gs
+        case ss
+        case es
+        case lk
+        case sd
+        case sr
+        case sj
+        case sz
+        case se
+        case ch
+        case sy
+        case tw
+        case tj
+        case tz
+        case th
+        case tl
+        case tg
+        case tk
+        case to
+        case tt
+        case tn
+        case tr
+        case tm
+        case tc
+        case tv
+        case ug
+        case ua
+        case ae
+        case gb
+        case us
+        case um
+        case uy
+        case uz
+        case vu
+        case ve
+        case vn
+        case vg
+        case vi
+        case wf
+        case eh
+        case ye
+        case zm
+        case zw
     }
     
     struct Lang {
@@ -454,7 +456,7 @@ public extension Attribute {
             guard let country = country else {
                 return language.rawValue
             }
-            return language.rawValue + "-\(country.rawValue)"
+            return language.rawValue + "-\(country.rawValue.uppercased())"
         }
     }
 }
@@ -466,4 +468,11 @@ public extension Tag {
         guard let l = l, condition else { return self }
         return attribute("lang", l.rawValue)
     }
+    
+    @discardableResult
+    func lang(_ language: Attribute.Language?, _ country: Attribute.Country? = nil, _ condition: Bool = true) -> Self {
+        guard let language = language else { return self }
+        let lang: Attribute.Lang = .init(language, country)
+        return self.lang(lang, condition)
+    }
 }

From f278a2f58389c1e01d861dbc0e4e3179ed308713 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 20:21:13 -0400
Subject: [PATCH 126/141] Add @discardableResult

---
 Sources/SwiftHtml/Attributes/Global.swift | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/Sources/SwiftHtml/Attributes/Global.swift b/Sources/SwiftHtml/Attributes/Global.swift
index 918a588..029455e 100644
--- a/Sources/SwiftHtml/Attributes/Global.swift
+++ b/Sources/SwiftHtml/Attributes/Global.swift
@@ -65,17 +65,20 @@ public extension Tag {
     }
 
     /// Specifies one classname for an element (refers to a class in a style sheet)
+    @discardableResult
     func `class`(_ value: String?, _ condition: Bool = true) -> Self {
         attribute("class", value, condition)
     }
 
     /// Specifies multiple classnames for an element (refers to a class in a style sheet)
+    @discardableResult
     func `class`(_ values: [String], _ condition: Bool = true) -> Self {
         /// @NOTE: explicit true flag is needed, otherwise Swift won't know which function to call...
         `class`(values.classString, condition)
     }
 
     /// Specifies multiple classnames for an element (refers to a class in a style sheet)
+    @discardableResult
     func `class`(_ values: String...) -> Self {
         `class`(values)
     }
@@ -84,6 +87,7 @@ public extension Tag {
     ///
     /// Note: If the value is empty or nil it won't be added to the list
     ///
+    @discardableResult
     func `class`(add value: String?, _ condition: Bool = true) -> Self {
         guard let value = value else {
             return self
@@ -95,6 +99,7 @@ public extension Tag {
     ///
     /// Note: If the value is empty it won't be added to the list
     ///
+    @discardableResult
     func `class`(add values: [String], _ condition: Bool = true) -> Self {
         let newValues = classArray + values.filter { !$0.isEmpty }
 
@@ -106,6 +111,7 @@ public extension Tag {
     }
     
     /// Removes a given class values if the condition is true
+    @discardableResult
     func `class`(remove value: String?, _ condition: Bool = true) -> Self {
         guard let value = value else {
             return self
@@ -114,6 +120,7 @@ public extension Tag {
     }
     
     /// Removes an array of class values if the condition is true
+    @discardableResult
     func `class`(remove values: [String], _ condition: Bool = true) -> Self {
         let newClasses = classArray.filter { !values.contains($0) }
         if newClasses.isEmpty {
@@ -123,6 +130,7 @@ public extension Tag {
     }
     
     /// toggles a single class value
+    @discardableResult
     func `class`(toggle value: String?, _ condition: Bool = true) -> Self {
         guard let value = value else {
             return self
@@ -141,18 +149,21 @@ public extension Tag {
     }
 
     /// Specifies one stylename for an element (refers to a style in a style sheet)
+    @discardableResult
     func style(_ value: String?, _ condition: Bool = true) -> Self {
         guard let value, !value.isEmpty else { return self }
         return attribute("style", value, condition)
     }
 
     /// Specifies multiple stylenames for an element (refers to a style in a style sheet)
+    @discardableResult
     func style(_ values: [String], _ condition: Bool = true) -> Self {
         /// @NOTE: explicit true flag is needed, otherwise Swift won't know which function to call...
         style(values.styleString, condition)
     }
 
     /// Specifies multiple stylenames for an element (refers to a style in a style sheet)
+    @discardableResult
     func style(_ values: String...) -> Self {
         style(values)
     }
@@ -161,6 +172,7 @@ public extension Tag {
     ///
     /// Note: If the value is empty or nil it won't be added to the list
     ///
+    @discardableResult
     func style(add value: String?, _ condition: Bool = true) -> Self {
         guard let value = value else {
             return self
@@ -172,6 +184,7 @@ public extension Tag {
     ///
     /// Note: If the value is empty it won't be added to the list
     ///
+    @discardableResult
     func style(add values: [String], _ condition: Bool = true) -> Self {
         let newValues = styleArray + values.filter { !$0.isEmpty }
 
@@ -183,6 +196,7 @@ public extension Tag {
     }
     
     /// Removes a given style values if the condition is true
+    @discardableResult
     func style(remove value: String?, _ condition: Bool = true) -> Self {
         guard let value = value else {
             return self
@@ -191,6 +205,7 @@ public extension Tag {
     }
     
     /// Removes an array of style values if the condition is true
+    @discardableResult
     func style(remove values: [String], _ condition: Bool = true) -> Self {
         let newClasses = styleArray.filter { !values.contains($0) }
         if newClasses.isEmpty {
@@ -201,6 +216,7 @@ public extension Tag {
     
     /// Removes a given style value with its key name if the condition is true
     /// `.style(removeByKey: "font-size")` as opposed to `.style(remove: "font-size: 12rem")`
+    @discardableResult
     func style(removeByKey value: String?, _ condition: Bool = true) -> Self {
         guard let value = value else {
             return self
@@ -211,6 +227,7 @@ public extension Tag {
     
     /// Removes an array of style values with the key name if the condition is true
     /// `.style(removeByKey:[ "font-size"])` as opposed to `.style(remove: ["font-size: 12rem"])`
+    @discardableResult
     func style(removeByKey values: [String], _ condition: Bool = true) -> Self {
         let newClasses = styleArray.filter { !values.contains(String($0.prefix(while: {$0 != ":"}))) }
         if newClasses.isEmpty {
@@ -220,6 +237,7 @@ public extension Tag {
     }
     
     /// toggles a single style value
+    @discardableResult
     func style(toggle value: String?, _ condition: Bool = true) -> Self {
         guard let value = value else {
             return self
@@ -234,56 +252,67 @@ public extension Tag {
     // MARK: - other global attributes
     
     /// Specifies a shortcut key to activate/focus an element
+    @discardableResult
     func accesskey(_ value: Character) -> Self {
         attribute("accesskey", String(value))
     }
     
     /// Specifies whether the content of an element is editable or not
+    @discardableResult
     func contenteditable(_ value: Bool) -> Self {
         attribute("contenteditable", String(value))
     }
     
     /// Used to store custom data private to the page or application
+    @discardableResult
     func data(key: String, _ value: String) -> Self {
         attribute("data-" + key, value)
     }
 
     /// Specifies the text direction for the content in an element
+    @discardableResult
     func dir(_ value: TextDirection = .ltr) -> Self {
         attribute("dir", value.rawValue)
     }
     
     /// Specifies whether an element is draggable or not
+    @discardableResult
     func draggable(_ value: Draggable = .auto) -> Self {
         attribute("draggable", value.rawValue)
     }
     
     /// Specifies that an element is not yet, or is no longer, relevant
+    @discardableResult
     func hidden(_ value: Bool? = nil) -> Self {
         attribute("hidden", value?.description)
     }
     
     /// Specifies a unique id for an element
+    @discardableResult
     func `id`(_ value: String) -> Self {
         attribute("id", value)
     }
     
     /// Specifies whether the element is to have its spelling and grammar checked or not
+    @discardableResult
     func spellcheck(_ value: Bool) -> Self {
         attribute("spellcheck", String(value))
     }
     
     /// Specifies the tabbing order of an element
+    @discardableResult
     func tabindex(_ value: Int) -> Self {
         attribute("tabindex", String(value))
     }
     
     /// Specifies extra information about an element
+    @discardableResult
     func title(_ value: String) -> Self {
         attribute("title", value)
     }
     
     /// Specifies whether the content of an element should be translated or not
+    @discardableResult
     func translate(_ value: Translate) -> Self {
         attribute("translate", value.rawValue)
     }

From 20620967725ad916b5168404ffacf2c55718ca11 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Thu, 27 Jul 2023 21:01:11 -0400
Subject: [PATCH 127/141] Minor tweak

---
 Sources/SwiftHtml/Attributes/Events.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index e95d1b6..f174ba6 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -103,6 +103,7 @@ public extension Tag {
         attribute(e.rawValue.lowercased(), function, condition)
     }
     
+    /// add multiple events and functions to a Tag
     @discardableResult
     func onEvents(_ efs: [Attribute.EventFunction]?, condition: Bool = true) -> Self {
         guard let efs = efs, condition else { return self }

From c45e230beb4fe4cb5398cbd642af1c345f74bca1 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 28 Jul 2023 08:23:40 -0400
Subject: [PATCH 128/141] Minor tweak

---
 Sources/SwiftHtml/Attributes/Events.swift | 2 +-
 Sources/SwiftSgml/Tag.swift               | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index f174ba6..e2d9734 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -107,7 +107,7 @@ public extension Tag {
     @discardableResult
     func onEvents(_ efs: [Attribute.EventFunction]?, condition: Bool = true) -> Self {
         guard let efs = efs, condition else { return self }
-        _ = efs.map { appendToAttribute($0.event.rawValue, $0.function, separator: ";\r") }
+        _ = efs.map { attribute(addTo: $0.event.rawValue, $0.function, separator: ";\r") }
         return self
     }
 }
diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 63681ce..863cd21 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -106,14 +106,15 @@ open class Tag {
     }
     
     @discardableResult
-    public func appendToAttribute(_ key: String, _ value: String?, separator: String? = nil, _ condition: Bool = true) -> Self {
-        guard condition else { return self }
+    public func attribute(addTo key: String, _ value: String?, separator: String? = nil, _ condition: Bool = true) -> Self {
+        guard let value = value, condition else { return self }
         let attribute: Attribute
         if let existing = attributes?.first(where: { $0.key == key }) {
-            attribute = .init(key: key, value: (existing.value ?? "") + (separator ?? "") + (value ?? ""))
+            attribute = .init(key: key, value: (existing.value ?? "") + (separator ?? "") + value)
         } else {
             attribute = .init(key: key, value: value)
         }
+        delete(attribute)
         upsert(attribute)
         return self
     }

From 4a3fd371248a659c9ab4cf70f0c0b513cda3678f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 28 Jul 2023 12:43:27 -0400
Subject: [PATCH 129/141] Minor tweak

---
 Sources/SwiftHtml/Attributes/Events.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index e2d9734..5363dde 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -93,6 +93,11 @@ public extension Attribute {
     struct EventFunction {
         let event: Event
         let function: JSFunction
+        
+        public init(_ event: Event, _ function: JSFunction) {
+            self.event = event
+            self.function = function
+        }
     }
 }
 

From 3e344edaf44a23396f24536d8edf88e8471bede9 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 28 Jul 2023 14:57:56 -0400
Subject: [PATCH 130/141] Minor tweak

---
 Sources/SwiftHtml/Tags/Link.swift | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Link.swift b/Sources/SwiftHtml/Tags/Link.swift
index d65c174..5078ec6 100644
--- a/Sources/SwiftHtml/Tags/Link.swift
+++ b/Sources/SwiftHtml/Tags/Link.swift
@@ -76,21 +76,25 @@ public extension Link {
     }
     
     /// Specifies how the element handles cross-origin requests
+    @discardableResult
     func crossorigin(_ value: Crossorigin) -> Self {
         attribute("crossorigin", value.rawValue)
     }
     
     /// Specifies the location of the linked document
+    @discardableResult
     func href(_ value: String) -> Self {
         attribute("href", value)
     }
     
     /// Specifies the language of the text in the linked document
+    @discardableResult
     func hreflang(_ value: String) -> Self {
         attribute("hreflang", value)
     }
     
     /// Specifies on what device the linked document will be displayed
+    @discardableResult
     func media(_ value: String) -> Self {
         attribute("media", value)
     }
@@ -98,6 +102,7 @@ public extension Link {
     /// Specifies what media/device the linked document is optimized for
     ///
     /// If multiple queries were provided they're going to be concatenated with an `and` operand
+    @discardableResult
     func media(_ queries: MediaQuery...) -> Self {
         return media(queries)
     }
@@ -105,35 +110,39 @@ public extension Link {
     /// Specifies what media/device the linked document is optimized for
     ///
     /// If multiple queries were provided they're going to be concatenated with an `and` operand
+    @discardableResult
     func media(_ queries: [MediaQuery]) -> Self {
         return media(queries.map(\.value).joined(separator: " and "))
     }
     
     /// Specifies which referrer to use when fetching the resource
+    @discardableResult
     func refererPolicy(_ value: RefererPolicy = .origin) -> Self {
         attribute("referrerpolicy", value.rawValue)
     }
 
     /// Allows a browser to check the fetched link to ensure that the code is never loaded if the source has been manipulated
+    @discardableResult
     func integrity(_ value: String) -> Self {
         attribute("integrity", value)
     }
     
     /// Specifies the size of the linked resource. Only for `rel="icon"`
+    @discardableResult
     func sizes(_ value: String) -> Self {
         attribute("sizes", value)
     }
     
     /// Specifies the size of the linked resource. For example `57x57` if the value is `57`.
+    @discardableResult
     func sizes(_ value: Int) -> Self {
         sizes(String(value) + "x" + String(value))
     }
         
     /// Specifies the media type of the linked document
+    @discardableResult
     func type(_ value: String) -> Self {
         attribute("type", value)
     }
-    
-    
 }
 

From 807f79c926cf543f16aba884352c496b8063247f Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sun, 30 Jul 2023 07:36:51 -0400
Subject: [PATCH 131/141] Fix <head> not including children Other Global
 Attributes... add nil values and conditions

---
 Sources/SwiftHtml/Attributes/Global.swift | 44 +++++++++++------------
 Sources/SwiftHtml/Tags/Html.swift         |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Global.swift b/Sources/SwiftHtml/Attributes/Global.swift
index 029455e..64fff6a 100644
--- a/Sources/SwiftHtml/Attributes/Global.swift
+++ b/Sources/SwiftHtml/Attributes/Global.swift
@@ -253,67 +253,67 @@ public extension Tag {
     
     /// Specifies a shortcut key to activate/focus an element
     @discardableResult
-    func accesskey(_ value: Character) -> Self {
-        attribute("accesskey", String(value))
+    func accesskey(_ value: Character?, _ condition: Bool = true) -> Self {
+        attribute("accesskey", value != nil ? String(value!) : nil, condition)
     }
     
     /// Specifies whether the content of an element is editable or not
     @discardableResult
-    func contenteditable(_ value: Bool) -> Self {
-        attribute("contenteditable", String(value))
+    func contenteditable(_ value: Bool?, _ condition: Bool = true) -> Self {
+        attribute("contenteditable", value != nil ? String(value!) : nil, condition)
     }
     
     /// Used to store custom data private to the page or application
     @discardableResult
-    func data(key: String, _ value: String) -> Self {
-        attribute("data-" + key, value)
+    func data(key: String, _ value: String?, _ condition: Bool = true) -> Self {
+        attribute("data-" + key, value, condition)
     }
 
     /// Specifies the text direction for the content in an element
     @discardableResult
-    func dir(_ value: TextDirection = .ltr) -> Self {
-        attribute("dir", value.rawValue)
+    func dir(_ value: TextDirection? = .ltr, _ condition: Bool = true) -> Self {
+        attribute("dir", value?.rawValue, condition)
     }
     
     /// Specifies whether an element is draggable or not
     @discardableResult
-    func draggable(_ value: Draggable = .auto) -> Self {
-        attribute("draggable", value.rawValue)
+    func draggable(_ value: Draggable? = .auto, _ condition: Bool = true) -> Self {
+        attribute("draggable", value?.rawValue, condition)
     }
     
     /// Specifies that an element is not yet, or is no longer, relevant
     @discardableResult
-    func hidden(_ value: Bool? = nil) -> Self {
-        attribute("hidden", value?.description)
+    func hidden(_ value: Bool? = nil, _ condition: Bool = true) -> Self {
+        attribute("hidden", value?.description, condition)
     }
     
     /// Specifies a unique id for an element
     @discardableResult
-    func `id`(_ value: String) -> Self {
-        attribute("id", value)
+    func `id`(_ value: String?, _ condition: Bool = true) -> Self {
+        attribute("id", value, condition)
     }
     
     /// Specifies whether the element is to have its spelling and grammar checked or not
     @discardableResult
-    func spellcheck(_ value: Bool) -> Self {
-        attribute("spellcheck", String(value))
+    func spellcheck(_ value: Bool?, _ condition: Bool = true) -> Self {
+        attribute("spellcheck", value != nil ? String(value!) : nil, condition)
     }
     
     /// Specifies the tabbing order of an element
     @discardableResult
-    func tabindex(_ value: Int) -> Self {
-        attribute("tabindex", String(value))
+    func tabindex(_ value: Int?, _ condition: Bool = true) -> Self {
+        attribute("tabindex", value != nil ? String(value!) : nil, condition)
     }
     
     /// Specifies extra information about an element
     @discardableResult
-    func title(_ value: String) -> Self {
-        attribute("title", value)
+    func title(_ value: String?, _ condition: Bool = true) -> Self {
+        attribute("title", value, condition)
     }
     
     /// Specifies whether the content of an element should be translated or not
     @discardableResult
-    func translate(_ value: Translate) -> Self {
-        attribute("translate", value.rawValue)
+    func translate(_ value: Translate?, _ condition: Bool = true) -> Self {
+        attribute("translate", value?.rawValue, condition)
     }
 }
diff --git a/Sources/SwiftHtml/Tags/Html.swift b/Sources/SwiftHtml/Tags/Html.swift
index a852ada..201bae1 100644
--- a/Sources/SwiftHtml/Tags/Html.swift
+++ b/Sources/SwiftHtml/Tags/Html.swift
@@ -19,7 +19,7 @@ open class Html: StandardTag {
     public init(lang: Attribute.Lang? = nil,
                 _ children: [Tag]? = nil) {
         self.lang = lang
-        super.init()
+        super.init(children)
         self.lang(lang)
     }
     

From 1da4ee096dc8786a63a3e913a093cadd21d167fc Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sun, 30 Jul 2023 07:52:15 -0400
Subject: [PATCH 132/141] <a> attribute include nil value and condition
 parameters

---
 Sources/SwiftHtml/Tags/A.swift | 40 +++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index 8a2e75a..d6b7c25 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -52,23 +52,23 @@ public extension A {
     }
     
     /// Specifies that the target will be downloaded when a user clicks on the hyperlink
-    func download(_ value: String? = nil) -> Self {
-        flagAttribute("download", value)
+    func download(_ value: String? = nil, _ condition: Bool = true) -> Self {
+        flagAttribute("download", value, condition)
     }
     
     /// Specifies the URL of the page the link goes to
-    func href(_ value: String) -> Self {
-        attribute("href", value)
+    func href(_ value: String?, _ condition: Bool = true) -> Self {
+        attribute("href", value, condition)
     }
     
     /// Specifies the language of the linked document
-    func hreflang(_ value: String) -> Self {
-        attribute("hreflang", value)
+    func hreflang(_ value: String?, _ condition: Bool = true) -> Self {
+        attribute("hreflang", value, condition)
     }
     
     /// Specifies what media/device the linked document is optimized for
-    func media(_ value: String) -> Self {
-        attribute("media", value)
+    func media(_ value: String?, _ condition: Bool = true) -> Self {
+        attribute("media", value, condition)
     }
     
     /// Specifies what media/device the linked document is optimized for
@@ -81,34 +81,34 @@ public extension A {
     /// Specifies what media/device the linked document is optimized for
     ///
     /// If multiple queries were provided they're going to be concatenated with an `and` operand
-    func media(_ queries: [MediaQuery]) -> Self {
-        return media(queries.map(\.value).joined(separator: " and "))
+    func media(_ queries: [MediaQuery]?, _ condition: Bool = true) -> Self {
+        return media(queries?.map(\.value).joined(separator: " and "), condition)
     }
     
     /// Specifies a space-separated list of URLs to which, when the link is followed, post requests with the body ping will be sent by the browser (in the background).
     ///
     /// Typically used for tracking.
-    func ping(_ value: [String]) -> Self {
-        attribute("ping", value.joined(separator: " "))
+    func ping(_ value: [String]?, _ condition: Bool = true) -> Self {
+        attribute("ping", value?.joined(separator: " "), condition)
     }
     
     /// Specifies which referrer information to send with the link
-    func refererPolicy(_ value: RefererPolicy = .origin) -> Self {
-        attribute("referrerpolicy", value.rawValue)
+    func refererPolicy(_ value: RefererPolicy? = .origin, _ condition: Bool = true) -> Self {
+        attribute("referrerpolicy", value?.rawValue, condition)
     }
     
     /// Specifies the relationship between the current document and the linked document
-    func rel(_ value: Rel) -> Self {
-        attribute("rel", value.rawValue)
+    func rel(_ value: Rel?, _ condition: Bool = true) -> Self {
+        attribute("rel", value?.rawValue, condition)
     }
 
     /// Specifies where to open the linked document
-    func target(_ value: TargetFrame, _ condition: Bool = true) -> Self {
-        attribute("target", value.rawValue, condition)
+    func target(_ value: TargetFrame?, _ condition: Bool = true) -> Self {
+        attribute("target", value?.rawValue, condition)
     }
     
     /// The type attribute specifies the Internet media type (formerly known as MIME type) of the linked document.
-    func type(_ value: String) -> Self {
-        attribute("type", value)
+    func type(_ value: String?, _ condition: Bool = true) -> Self {
+        attribute("type", value, condition)
     }
 }

From f6f1b6639a440b4d74afa5eda2a0a53f673ef81d Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sun, 30 Jul 2023 08:05:39 -0400
Subject: [PATCH 133/141] Add @discardableResult to <a> attributes

---
 Sources/SwiftHtml/Tags/A.swift | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Sources/SwiftHtml/Tags/A.swift b/Sources/SwiftHtml/Tags/A.swift
index d6b7c25..b26e1dd 100644
--- a/Sources/SwiftHtml/Tags/A.swift
+++ b/Sources/SwiftHtml/Tags/A.swift
@@ -52,21 +52,25 @@ public extension A {
     }
     
     /// Specifies that the target will be downloaded when a user clicks on the hyperlink
+    @discardableResult
     func download(_ value: String? = nil, _ condition: Bool = true) -> Self {
         flagAttribute("download", value, condition)
     }
     
     /// Specifies the URL of the page the link goes to
+    @discardableResult
     func href(_ value: String?, _ condition: Bool = true) -> Self {
         attribute("href", value, condition)
     }
     
     /// Specifies the language of the linked document
+    @discardableResult
     func hreflang(_ value: String?, _ condition: Bool = true) -> Self {
         attribute("hreflang", value, condition)
     }
     
     /// Specifies what media/device the linked document is optimized for
+    @discardableResult
     func media(_ value: String?, _ condition: Bool = true) -> Self {
         attribute("media", value, condition)
     }
@@ -74,6 +78,7 @@ public extension A {
     /// Specifies what media/device the linked document is optimized for
     ///
     /// If multiple queries were provided they're going to be concatenated with an `and` operand
+    @discardableResult
     func media(_ queries: MediaQuery...) -> Self {
         return media(queries)
     }
@@ -81,6 +86,7 @@ public extension A {
     /// Specifies what media/device the linked document is optimized for
     ///
     /// If multiple queries were provided they're going to be concatenated with an `and` operand
+    @discardableResult
     func media(_ queries: [MediaQuery]?, _ condition: Bool = true) -> Self {
         return media(queries?.map(\.value).joined(separator: " and "), condition)
     }
@@ -88,26 +94,31 @@ public extension A {
     /// Specifies a space-separated list of URLs to which, when the link is followed, post requests with the body ping will be sent by the browser (in the background).
     ///
     /// Typically used for tracking.
+    @discardableResult
     func ping(_ value: [String]?, _ condition: Bool = true) -> Self {
         attribute("ping", value?.joined(separator: " "), condition)
     }
     
     /// Specifies which referrer information to send with the link
+    @discardableResult
     func refererPolicy(_ value: RefererPolicy? = .origin, _ condition: Bool = true) -> Self {
         attribute("referrerpolicy", value?.rawValue, condition)
     }
     
     /// Specifies the relationship between the current document and the linked document
+    @discardableResult
     func rel(_ value: Rel?, _ condition: Bool = true) -> Self {
         attribute("rel", value?.rawValue, condition)
     }
 
     /// Specifies where to open the linked document
+    @discardableResult
     func target(_ value: TargetFrame?, _ condition: Bool = true) -> Self {
         attribute("target", value?.rawValue, condition)
     }
     
     /// The type attribute specifies the Internet media type (formerly known as MIME type) of the linked document.
+    @discardableResult
     func type(_ value: String?, _ condition: Bool = true) -> Self {
         attribute("type", value, condition)
     }

From 674a9483d0436bfdaba9e7930f1c85fcf531c23c Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Tue, 1 Aug 2023 11:38:25 -0400
Subject: [PATCH 134/141] Redundant init()

---
 Sources/SwiftSgml/Tag.swift | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index 863cd21..bd44dd6 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -61,10 +61,6 @@ open class Tag {
                   [builder()])
     }
     
-    public convenience init(_ contents: String) {
-        self.init(contents: contents)
-    }
-    
     // MARK: - contents
     
     /// set contents

From 74abc980ba051c8ccc25276e4ab2cb96c46eeb80 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 2 Aug 2023 11:01:50 -0400
Subject: [PATCH 135/141] Tag init() with contents String

---
 Sources/SwiftSgml/Tag.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Sources/SwiftSgml/Tag.swift b/Sources/SwiftSgml/Tag.swift
index bd44dd6..863cd21 100644
--- a/Sources/SwiftSgml/Tag.swift
+++ b/Sources/SwiftSgml/Tag.swift
@@ -61,6 +61,10 @@ open class Tag {
                   [builder()])
     }
     
+    public convenience init(_ contents: String) {
+        self.init(contents: contents)
+    }
+    
     // MARK: - contents
     
     /// set contents

From e9507215517e5c4801ad1b33eae50ea34f810ffb Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Wed, 2 Aug 2023 12:04:21 -0400
Subject: [PATCH 136/141] Remove convenience inits

---
 Sources/SwiftHtml/Tags/Body.swift | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Body.swift b/Sources/SwiftHtml/Tags/Body.swift
index 111b059..9d092fb 100644
--- a/Sources/SwiftHtml/Tags/Body.swift
+++ b/Sources/SwiftHtml/Tags/Body.swift
@@ -12,24 +12,5 @@
 /// **Note:** There can only be one `<body>` element in an HTML document.
 open class Body: StandardTag {
     
-    override open class var name: String { .init(describing: Body.self).lowercased() }
-    
-    public convenience init(scripts: [Script] = [],
-                            eventFunctions: [Attribute.EventFunction] = [],
-                            _ children: [Tag]? = nil) {
-        let temp = Tag {
-            children ?? []
-            scripts
-        }
-        self.init(attributes: nil, temp.children)   // attributes parameter included to disambiguate init()
-        self.onEvents(eventFunctions)
-    }
-    
-    public convenience init(scripts: [Script] = [],
-                            eventFunctions: [Attribute.EventFunction] = [],
-                            @TagBuilder _ builder: () -> Tag) {
-        self.init(scripts: scripts,
-                  eventFunctions: eventFunctions,
-                  [builder()])
-    }
+    override open class var name: String { .init(describing: Body.self).lowercased() }    
 }

From 74d45a3b449d412514afa83921f76380fd6bff89 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 4 Aug 2023 12:40:39 -0400
Subject: [PATCH 137/141] Fix rendering of onEvent values

---
 Sources/SwiftHtml/Attributes/Events.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 5363dde..6a83250 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -112,7 +112,7 @@ public extension Tag {
     @discardableResult
     func onEvents(_ efs: [Attribute.EventFunction]?, condition: Bool = true) -> Self {
         guard let efs = efs, condition else { return self }
-        _ = efs.map { attribute(addTo: $0.event.rawValue, $0.function, separator: ";\r") }
+        _ = efs.map { attribute(addTo: "on" + $0.event.rawValue.prefix(1).uppercased() + $0.event.rawValue.dropFirst(), $0.function, separator: ";\r") }
         return self
     }
 }

From 10ade30c427b34c80a2dc4fd815b38a64917e123 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 4 Aug 2023 12:59:47 -0400
Subject: [PATCH 138/141] Fix event raw value

---
 Sources/SwiftHtml/Attributes/Events.swift | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 6a83250..bab002e 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -86,6 +86,10 @@ public extension Attribute {
         case waiting          // Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
         // Misc
         case toggle           // Fires when the user opens or closes the <details> element
+        
+        public var onRawValue: String {
+            "on" + rawValue.prefix(1).uppercased() + rawValue.dropFirst()
+        }
     }
     
     typealias JSFunction = String
@@ -105,14 +109,14 @@ public extension Tag {
     
     @discardableResult
     func onEvent(_ e: Attribute.Event, _ function: Attribute.JSFunction?, _ condition: Bool = true) -> Self {
-        attribute(e.rawValue.lowercased(), function, condition)
+        attribute(e.onRawValue, function, condition)
     }
-    
+
     /// add multiple events and functions to a Tag
     @discardableResult
     func onEvents(_ efs: [Attribute.EventFunction]?, condition: Bool = true) -> Self {
         guard let efs = efs, condition else { return self }
-        _ = efs.map { attribute(addTo: "on" + $0.event.rawValue.prefix(1).uppercased() + $0.event.rawValue.dropFirst(), $0.function, separator: ";\r") }
+        _ = efs.map { attribute(addTo: $0.event.onRawValue, $0.function, separator: ";\r") }
         return self
     }
 }

From 521c71b853a43d2b8c1301bec731ccd65732084a Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Fri, 4 Aug 2023 13:17:07 -0400
Subject: [PATCH 139/141] Minor fix to event raw value

---
 Sources/SwiftHtml/Attributes/Events.swift | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index bab002e..a9a0fd1 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -86,10 +86,6 @@ public extension Attribute {
         case waiting          // Script to be run when the media has paused but is expected to resume (like when the media pauses to buffer more data)
         // Misc
         case toggle           // Fires when the user opens or closes the <details> element
-        
-        public var onRawValue: String {
-            "on" + rawValue.prefix(1).uppercased() + rawValue.dropFirst()
-        }
     }
     
     typealias JSFunction = String
@@ -109,14 +105,14 @@ public extension Tag {
     
     @discardableResult
     func onEvent(_ e: Attribute.Event, _ function: Attribute.JSFunction?, _ condition: Bool = true) -> Self {
-        attribute(e.onRawValue, function, condition)
+        attribute("on" + e.rawValue.lowercased(), function, condition)
     }
 
     /// add multiple events and functions to a Tag
     @discardableResult
     func onEvents(_ efs: [Attribute.EventFunction]?, condition: Bool = true) -> Self {
         guard let efs = efs, condition else { return self }
-        _ = efs.map { attribute(addTo: $0.event.onRawValue, $0.function, separator: ";\r") }
+        _ = efs.map { attribute(addTo: "on" + $0.event.rawValue.lowercased(), $0.function, separator: ";\r") }
         return self
     }
 }

From 7124734ecb1ea6480009b65e13f012f9307e88b4 Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sat, 5 Aug 2023 07:11:39 -0400
Subject: [PATCH 140/141] Update form functions to match standard pattern

---
 Sources/SwiftHtml/Tags/Form.swift | 39 ++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/Sources/SwiftHtml/Tags/Form.swift b/Sources/SwiftHtml/Tags/Form.swift
index 55fd824..7a1d9ca 100644
--- a/Sources/SwiftHtml/Tags/Form.swift
+++ b/Sources/SwiftHtml/Tags/Form.swift
@@ -49,47 +49,58 @@ public extension Form {
     }
     
     /// Specifies the character encodings that are to be used for the form submission
-    func acceptCharset(_ value: String) -> Self {
-        attribute("accept-charset", value)
+    @discardableResult
+    func acceptCharset(_ value: String?, _ condition: Bool = true) -> Self {
+        attribute("accept-charset", value, condition)
     }
     
     /// Specifies where to send the form-data when a form is submitted
-    func action(_ value: String?) -> Self {
-        attribute("action", value)
+    @discardableResult
+    func action(_ value: String?, _ condition: Bool = true) -> Self {
+        attribute("action", value, condition)
     }
     
     /// Specifies whether a form should have autocomplete on or off
-    func autocomplete(_ value: Bool = true) -> Self {
-        attribute("autocomplete", value ? "on" : "off")
+    @discardableResult
+    func autocomplete(_ value: Bool? = true, _ condition: Bool = true) -> Self {
+        var onOffValue: String?
+        if let value = value { onOffValue = value ? "on" : "off" }
+        return attribute("autocomplete", onOffValue, condition)
     }
     
     /// Specifies how the form-data should be encoded when submitting it to the server (only for method="post")
+    @discardableResult
     func enctype(_ value: Enctype?, _ condition: Bool = true) -> Self {
         attribute("enctype", value?.rawValue, condition)
     }
     
     /// Specifies the HTTP method to use when sending form-data
-    func method(_ value: Method?) -> Self {
-        attribute("method", value?.rawValue)
+    @discardableResult
+    func method(_ value: Method?, _ condition: Bool = true) -> Self {
+        attribute("method", value?.rawValue, condition)
     }
     
     /// Specifies the name of a form
-    func name(_ value: String) -> Self {
-        attribute("name", value)
+    @discardableResult
+    func name(_ value: String?, _ condition: Bool = true) -> Self {
+        attribute("name", value, condition)
     }
     
     /// Specifies that the form should not be validated when submitted
+    @discardableResult
     func novalidate(_ condition: Bool = true) -> Self {
         flagAttribute("novalidate", nil, condition)
     }
     
     /// Specifies the relationship between a linked resource and the current document
-    func rel(_ value: Rel) -> Self {
-        attribute("rel", value.rawValue)
+    @discardableResult
+    func rel(_ value: Rel?, _ condition: Bool = true) -> Self {
+        attribute("rel", value?.rawValue, condition)
     }
     
     /// Specifies where to display the response that is received after submitting the form
-    func target(_ value: Target) -> Self {
-        attribute("target", value.rawValue)
+    @discardableResult
+    func target(_ value: Target?, condition: Bool = true) -> Self {
+        attribute("target", value?.rawValue, condition)
     }
 }

From 7535a7a5392cb08d3847d5d172937d46c31eb4ce Mon Sep 17 00:00:00 2001
From: bgisme <55024704+bgisme@users.noreply.github.com>
Date: Sun, 6 Aug 2023 09:04:21 -0400
Subject: [PATCH 141/141] Minor fix

---
 Sources/SwiftHtml/Attributes/Events.swift | 4 +---
 Tests/SwiftHtmlTests/SwiftHtmlTests.swift | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Sources/SwiftHtml/Attributes/Events.swift b/Sources/SwiftHtml/Attributes/Events.swift
index 02d72e7..0f3379a 100644
--- a/Sources/SwiftHtml/Attributes/Events.swift
+++ b/Sources/SwiftHtml/Attributes/Events.swift
@@ -6,9 +6,7 @@
 //
 
 public extension Attribute {
-    
-    typealias JSFunction = String
-    
+        
     enum Event: String {
         // Windows
         case afterPrint       // Script to be run after the document is printed
diff --git a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
index 3c32d6c..f1c87b9 100644
--- a/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
+++ b/Tests/SwiftHtmlTests/SwiftHtmlTests.swift
@@ -227,10 +227,10 @@ final class SwiftHtmlTests: XCTestCase {
 
         let doc = Document {
             Div {
-                values.map { item -> Tag in
+                for value in values {
                     Tag {
-                        H1(item)
-                        P(item)
+                        H1(value)
+                        P(value)
                     }
                 }
             }