diff --git a/web/making_a_web_site.anubis b/web/making_a_web_site.anubis
index 30134cd..c046dbe 100644
--- a/web/making_a_web_site.anubis
+++ b/web/making_a_web_site.anubis
@@ -1410,17 +1410,23 @@ public define HTML h1(List(CoreAttrs) attrs, HTML content)        = html_tag("h1
 public define HTML h1(CoreAttrs attr, HTML content)               = html_tag("h1", [attr], [content]).
 public define HTML h1(List(HTML) content)                         = html_tag("h1",     content).
 public define HTML h1(HTML content)                               = html_tag("h1",     [content]).
+
   // <h2>
 public define HTML h2(List(CoreAttrs) attrs, List(HTML) content)  = html_tag("h2", attrs, content).
+public define HTML h2(CoreAttrs attr, List(HTML) content)         = html_tag("h2", [attr], content).
 public define HTML h2(List(CoreAttrs) attrs, HTML content)        = html_tag("h2", attrs, [content]).
+public define HTML h2(CoreAttrs attr, HTML content)               = html_tag("h2", [attr], [content]).
 public define HTML h2(List(HTML) content)                         = html_tag("h2",     content).
 public define HTML h2(HTML content)                               = html_tag("h2",     [content]).
+
   // <h3>
 public define HTML h3(List(CoreAttrs) attrs, List(HTML) content)  = html_tag("h3", attrs, content).
+public define HTML h3(CoreAttrs attr, List(HTML) content)         = html_tag("h3", [attr], content).
 public define HTML h3(List(CoreAttrs) attrs, HTML content)        = html_tag("h3", attrs, [content]).
-public define HTML h3(List(HTML) content)                         = html_tag("h3",     content).
-public define HTML h3(HTML content)                               = html_tag("h3",     [content]).
-public define HTML h3(String content)                                      = html_tag("h3",     [text(content)]).
+public define HTML h3(CoreAttrs attr, HTML content)               = html_tag("h3", [attr], [content]).
+public define HTML h3(List(HTML) content)                         = html_tag("h3", [],     content).
+public define HTML h3(HTML content)                               = html_tag("h3", [],    [content]).
+public define HTML h3(String content)                              = html_tag("h3",     [text(content)]).
 
   // <h4>
 public define HTML h4(List(CoreAttrs) attrs, List(HTML) content)  = html_tag("h4", attrs, content).
@@ -1447,14 +1453,15 @@ public define HTML hr(CoreAttrs attr)                                      = htm
   // <i>
 public define HTML i(List(CoreAttrs) attrs, List(HTML) content)   = html_tag("i", attrs,   content).
 public define HTML i(List(CoreAttrs) attrs, HTML content)         = html_tag("i", attrs,   [content]).
-public define HTML i(List(CoreAttrs) attrs)                                = html_tag("i", attrs).
+public define HTML i(List(CoreAttrs) attrs)                       = html_tag("i", attrs, []).
+public define HTML i(CoreAttrs attr)                              = html_tag("i", [attr], []).
 public define HTML i(CoreAttrs attr, List(HTML) content)          = html_tag("i", [attr],  content).
 public define HTML i(CoreAttrs attr, HTML content)                = html_tag("i", [attr],  [content]).
-public define HTML i(List(HTML) content)                          = html_tag("i",       content).
-public define HTML i(HTML content)                                = html_tag("i",       [content]).
-public define HTML i(String string)                                        = html_tag("i",       [text(string)]).
-public define HTML i(CoreAttrs attr, String string)                        = html_tag("i", [attr],  [text(string)]).
-public define HTML i(List(CoreAttrs) attrs, String string)                 = html_tag("i", attrs,   [text(string)]).
+public define HTML i(List(HTML) content)                          = html_tag("i", [],      content).
+public define HTML i(HTML content)                                = html_tag("i", [],      [content]).
+public define HTML i(String string)                               = html_tag("i", [],      [text(string)]).
+public define HTML i(CoreAttrs attr, String string)               = html_tag("i", [attr],  [text(string)]).
+public define HTML i(List(CoreAttrs) attrs, String string)        = html_tag("i", attrs,   [text(string)]).
 
   // <iframe>
 public define HTML iframe(CoreAttrs _attr, String src, Int width, Int height) =
--
libgit2 0.21.4