diff --git a/dist/demo/index.html b/dist/demo/index.html
index 816215554..baa3d968f 100644
--- a/dist/demo/index.html
+++ b/dist/demo/index.html
@@ -5,7 +5,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <title>Mermaid Quick Test Page</title>
   <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=">
-  <link rel="stylesheet" href="../mermaid.css">
+  <link rel="stylesheet" href="../mermaid.forest.css">
 </head>
 <body>
   <div class="mermaid">
@@ -59,6 +59,46 @@ Add gantt diagram to demo page      : 20h
 Add another diagram to demo page    : 48h
   </div>
 
+  <hr/>
+
+  <div class="mermaid">
+gitGraph :
+options
+{
+    "key": "value",
+    "nodeWidth": 150,
+    "nodeSpacing" : 150
+}
+end
+    commit
+    branch newbranch
+    checkout newbranch
+    commit
+    commit
+    checkout master
+    commit
+    commit
+    merge newbranch
+  </div>
+
+  <hr/>
+
+  <div class="mermaid">
+classDiagram
+    Class01 <|-- AveryLongClass : Cool
+    Class03 *-- Class04
+    Class05 o-- Class06
+    Class07 .. Class08
+    Class09 --> C2 : Where am i?
+    Class09 --* C3
+    Class09 --|> Class07
+    Class07 : equals()
+    Class07 : Object[] elementData
+    Class01 : size()
+    Class01 : int chimp
+    Class01 : int gorilla
+    Class08 <--> C2: Cool label
+  </div>
   <script src="../mermaid.js"></script>
   <script>
     mermaid.initialize({startOnLoad:true});
diff --git a/src/test.html b/src/test.html
deleted file mode 100644
index a667fcade..000000000
--- a/src/test.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-    <head>
-        <meta charset="utf-8">
-        <title></title>
-
-        <script src="..\dist\mermaid.js"></script>
-        <script>mermaid.initialize({startOnLoad:true});</script>
-        <style>
-            .node-label p {
-                    margin:0px;
-                    font-size:12px;
-            }
-            p.branch-label {
-                font-weight:bold;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="mermaid">
-gitGraph :
-options
-{"key": "value",
-"nodeWidth": 150
-}
-end
-    commit
-    commit
-    commit
-    branch newbranch
-    checkout newbranch
-    commit
-    commit
-    merge master
-    checkout master
-    commit
-    commit
-        </div>
-    </body>
-
diff --git a/todo.md b/todo.md
index 72c2bc429..04deef43b 100644
--- a/todo.md
+++ b/todo.md
@@ -1,4 +1,5 @@
-- Upgrade d3 to version 4
+- upgrade d3 to version 4
 - use external d3-textwrap library
     - Problem is it's for d3 v4 only
 - node console output colors like Chrome console
+- default theme doesn't work for class diagram
