diff --git a/build.gradle b/build.gradle
index 3b9ab7c..de2154a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
-    compile "nl.astraeus:komp:0.1.7"
+    compile "nl.astraeus:komp:0.1.9"
 }
 
 compileKotlin2Js {

diff --git a/build.gradle b/build.gradle
index 3b9ab7c..de2154a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
-    compile "nl.astraeus:komp:0.1.7"
+    compile "nl.astraeus:komp:0.1.9"
 }
 
 compileKotlin2Js {
diff --git a/komp-todo.iml b/komp-todo.iml
index 2848213..85b99dd 100644
--- a/komp-todo.iml
+++ b/komp-todo.iml
@@ -44,17 +44,17 @@
     </content>
     <orderEntry type="jdk" jdkName="Kotlin SDK" jdkType="KotlinSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: nl.astraeus:komp:0.1.7" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: nl.astraeus:komp:0.1.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.6.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.6.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: nl.astraeus:komp:0.1.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: nl.astraeus:komp:0.1.9" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.6.10" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.6.10" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: nl.astraeus:komp:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: nl.astraeus:komp:0.1.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.6.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.6.10" level="project" />

diff --git a/build.gradle b/build.gradle
index 3b9ab7c..de2154a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
-    compile "nl.astraeus:komp:0.1.7"
+    compile "nl.astraeus:komp:0.1.9"
 }
 
 compileKotlin2Js {
diff --git a/komp-todo.iml b/komp-todo.iml
index 2848213..85b99dd 100644
--- a/komp-todo.iml
+++ b/komp-todo.iml
@@ -44,17 +44,17 @@
     </content>
     <orderEntry type="jdk" jdkName="Kotlin SDK" jdkType="KotlinSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: nl.astraeus:komp:0.1.7" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: nl.astraeus:komp:0.1.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.6.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.6.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: nl.astraeus:komp:0.1.7" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: nl.astraeus:komp:0.1.9" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.6.10" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.6.10" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: nl.astraeus:komp:0.1.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: nl.astraeus:komp:0.1.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.6.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.6.10" level="project" />
diff --git a/src/main/kotlin/nl/astraeus/komp/todo/Todo.kt b/src/main/kotlin/nl/astraeus/komp/todo/Todo.kt
index 1adaf80..730f58a 100644
--- a/src/main/kotlin/nl/astraeus/komp/todo/Todo.kt
+++ b/src/main/kotlin/nl/astraeus/komp/todo/Todo.kt
@@ -2,7 +2,6 @@
 
 import kotlinx.html.HtmlBlockTag
 import kotlinx.html.InputType
-import kotlinx.html.TagConsumer
 import kotlinx.html.a
 import kotlinx.html.button
 import kotlinx.html.classes
@@ -21,9 +20,9 @@
 import kotlinx.html.span
 import kotlinx.html.strong
 import kotlinx.html.ul
+import nl.astraeus.komp.HtmlBuilder
 import nl.astraeus.komp.Komponent
 import nl.astraeus.komp.include
-import org.w3c.dom.HTMLElement
 import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.events.Event
 import org.w3c.dom.events.KeyboardEvent
@@ -56,7 +55,7 @@
     val todo: Todo
 ) : Komponent() {
 
-  override fun render(consumer: TagConsumer<HTMLElement>) = consumer.li {
+  override fun render(consumer: HtmlBuilder) = consumer.li {
     if (todo.editing) {
       classes += "editing"
       input(classes = "edit") {
@@ -181,7 +180,7 @@
     }
   }
 
-  override fun render(consumer: TagConsumer<HTMLElement>) = consumer.section(classes = "todoapp") {
+  override fun render(consumer: HtmlBuilder) = consumer.section(classes = "todoapp") {
     header(classes = "header") {
       h1 { +"todos" }
       input(classes = "new-todo") {