diff --git a/output/dot/templates.go b/output/dot/templates.go
index 10bb594b4..dc67d7388 100644
--- a/output/dot/templates.go
+++ b/output/dot/templates.go
@@ -6,18 +6,18 @@ import (
 	"github.com/jessevdk/go-assets"
 )
 
-var _Assets21532ae17ad95976ac467eeaeab81f2bb1d537e4 = "digraph {{ .Schema.Name }} {\n  // Config\n  graph [rankdir=TB, layout=dot, margin=0.2, fontname=\"Arial\"];\n  node [shape=record, fontsize=14, fontname=\"Arial\"];\n  edge [fontsize=10, labelfloat=false, splines=none, fontname=\"Arial\"];\n\n  // Tables\n  {{- range $i, $t := .Schema.Tables }}\n  {{ $t.Name }} [shape=none, margin=0.2, label=<<table border=\"0\" cellborder=\"1\" cellspacing=\"0\" cellpadding=\"4\">\n                 <tr><td><b>{{ $t.Name }}</b> <font color=\"#666666\">[{{ $t.Type }}]</font></td></tr>\n                 {{- range $ii, $c := $t.Columns }}\n                 <tr><td port=\"{{ $c.Name }}\" align=\"left\">{{ $c.Name }} <font color=\"#666666\">[{{ $c.Type }}]</font></td></tr>\n                 {{- end }}\n              </table>>];\n  {{- end }}\n\n  // Relations\n  {{- range $j, $r := .Schema.Relations }}\n  {{ $r.Table.Name }}:{{ $c := index $r.Columns 0 }}{{ $c.Name }} -> {{ $r.ParentTable.Name }}:{{ $pc := index $r.ParentColumns 0 }}{{ $pc.Name }} [arrowhead=crow, taillabel=<<table cellpadding=\"5\" border=\"0\" cellborder=\"0\"><tr><td>{{ $r.Def }}</td></tr></table>>];\n  {{- end }}\n}\n"
+var _Assets21532ae17ad95976ac467eeaeab81f2bb1d537e4 = "digraph {{ .Schema.Name }} {\n  // Config\n  graph [rankdir=TB, layout=dot, margin=0.2, fontname=\"Arial\"];\n  node [shape=record, fontsize=14, fontname=\"Arial\"];\n  edge [fontsize=10, labelfloat=false, splines=none, fontname=\"Arial\"];\n\n  // Tables\n  {{- range $i, $t := .Schema.Tables }}\n  {{ $t.Name }} [shape=none, margin=0.2, label=<<table border=\"0\" cellborder=\"1\" cellspacing=\"0\" cellpadding=\"6\">\n                 <tr><td bgcolor=\"#EFEFEF\"><font face=\"Arial Bold\" point-size=\"18\">{{ $t.Name }}</font> <font color=\"#666666\">[{{ $t.Type }}]</font></td></tr>\n                 {{- range $ii, $c := $t.Columns }}\n                 <tr><td port=\"{{ $c.Name }}\" align=\"left\">{{ $c.Name }} <font color=\"#666666\">[{{ $c.Type }}]</font></td></tr>\n                 {{- end }}\n              </table>>];\n  {{- end }}\n\n  // Relations\n  {{- range $j, $r := .Schema.Relations }}\n  {{ $r.Table.Name }}:{{ $c := index $r.Columns 0 }}{{ $c.Name }} -> {{ $r.ParentTable.Name }}:{{ $pc := index $r.ParentColumns 0 }}{{ $pc.Name }} [dir=back, arrowtail=crow, taillabel=<<table cellpadding=\"5\" border=\"0\" cellborder=\"0\"><tr><td>{{ $r.Def }}</td></tr></table>>];\n  {{- end }}\n}\n"
 
 // Assets returns go-assets FileSystem
 var Assets = assets.NewFileSystem(map[string][]string{"/": []string{"schema.dot.tmpl"}}, map[string]*assets.File{
-	"/": &assets.File{
-		Path:     "/",
-		FileMode: 0x800001ed,
-		Mtime:    time.Unix(1527429522, 1527429522000000000),
-		Data:     nil,
-	}, "/schema.dot.tmpl": &assets.File{
+	"/schema.dot.tmpl": &assets.File{
 		Path:     "/schema.dot.tmpl",
 		FileMode: 0x1a4,
-		Mtime:    time.Unix(1527429522, 1527429522000000000),
+		Mtime:    time.Unix(1527431106, 1527431106000000000),
 		Data:     []byte(_Assets21532ae17ad95976ac467eeaeab81f2bb1d537e4),
+	}, "/": &assets.File{
+		Path:     "/",
+		FileMode: 0x800001ed,
+		Mtime:    time.Unix(1527431106, 1527431106000000000),
+		Data:     nil,
 	}}, "")
diff --git a/output/dot/templates/schema.dot.tmpl b/output/dot/templates/schema.dot.tmpl
index 26284326a..05a68f06d 100644
--- a/output/dot/templates/schema.dot.tmpl
+++ b/output/dot/templates/schema.dot.tmpl
@@ -6,8 +6,8 @@ digraph {{ .Schema.Name }} {
 
   // Tables
   {{- range $i, $t := .Schema.Tables }}
-  {{ $t.Name }} [shape=none, margin=0.2, label=<<table border="0" cellborder="1" cellspacing="0" cellpadding="4">
-                 <tr><td><b>{{ $t.Name }}</b> <font color="#666666">[{{ $t.Type }}]</font></td></tr>
+  {{ $t.Name }} [shape=none, margin=0.2, label=<<table border="0" cellborder="1" cellspacing="0" cellpadding="6">
+                 <tr><td bgcolor="#EFEFEF"><font face="Arial Bold" point-size="18">{{ $t.Name }}</font> <font color="#666666">[{{ $t.Type }}]</font></td></tr>
                  {{- range $ii, $c := $t.Columns }}
                  <tr><td port="{{ $c.Name }}" align="left">{{ $c.Name }} <font color="#666666">[{{ $c.Type }}]</font></td></tr>
                  {{- end }}
@@ -16,6 +16,6 @@ digraph {{ .Schema.Name }} {
 
   // Relations
   {{- range $j, $r := .Schema.Relations }}
-  {{ $r.Table.Name }}:{{ $c := index $r.Columns 0 }}{{ $c.Name }} -> {{ $r.ParentTable.Name }}:{{ $pc := index $r.ParentColumns 0 }}{{ $pc.Name }} [arrowhead=crow, taillabel=<<table cellpadding="5" border="0" cellborder="0"><tr><td>{{ $r.Def }}</td></tr></table>>];
+  {{ $r.Table.Name }}:{{ $c := index $r.Columns 0 }}{{ $c.Name }} -> {{ $r.ParentTable.Name }}:{{ $pc := index $r.ParentColumns 0 }}{{ $pc.Name }} [dir=back, arrowtail=crow, taillabel=<<table cellpadding="5" border="0" cellborder="0"><tr><td>{{ $r.Def }}</td></tr></table>>];
   {{- end }}
 }
diff --git a/output/md/templates.go b/output/md/templates.go
index 9ff8b8dde..a15a4eaeb 100644
--- a/output/md/templates.go
+++ b/output/md/templates.go
@@ -11,12 +11,7 @@ var _Assetsac44302fb6150a621aa9d04a0350aac972bf7e18 = "# {{ .Table.Name }}\n\n##
 
 // Assets returns go-assets FileSystem
 var Assets = assets.NewFileSystem(map[string][]string{"/": []string{"index.md.tmpl", "table.md.tmpl"}}, map[string]*assets.File{
-	"/table.md.tmpl": &assets.File{
-		Path:     "/table.md.tmpl",
-		FileMode: 0x1a4,
-		Mtime:    time.Unix(1527296235, 1527296235000000000),
-		Data:     []byte(_Assetsac44302fb6150a621aa9d04a0350aac972bf7e18),
-	}, "/": &assets.File{
+	"/": &assets.File{
 		Path:     "/",
 		FileMode: 0x800001ed,
 		Mtime:    time.Unix(1527296235, 1527296235000000000),
@@ -26,4 +21,9 @@ var Assets = assets.NewFileSystem(map[string][]string{"/": []string{"index.md.tm
 		FileMode: 0x1a4,
 		Mtime:    time.Unix(1526904993, 1526904993000000000),
 		Data:     []byte(_Assets43889384df1c6f74d764c29d91b9d5637eb46061),
+	}, "/table.md.tmpl": &assets.File{
+		Path:     "/table.md.tmpl",
+		FileMode: 0x1a4,
+		Mtime:    time.Unix(1527296235, 1527296235000000000),
+		Data:     []byte(_Assetsac44302fb6150a621aa9d04a0350aac972bf7e18),
 	}}, "")