diff --git a/tools/odin-html-docs/odin_html_docs_main.odin b/tools/odin-html-docs/odin_html_docs_main.odin
index 988c54d9d..317d95a5a 100644
--- a/tools/odin-html-docs/odin_html_docs_main.odin
+++ b/tools/odin-html-docs/odin_html_docs_main.odin
@@ -107,6 +107,51 @@ write_html_header :: proc(w: io.Writer, title: string) {
 }
 
 write_html_footer :: proc(w: io.Writer) {
+	io.write_string(w, `
+	<script type="text/javascript">
+	(function (win, doc) {
+		'use strict';
+		if (!doc.querySelectorAll || !win.addEventListener) {
+			// doesn't cut the mustard.
+			return;
+		}
+		let toggles = doc.querySelectorAll('[aria-controls]');
+		for (let i = 0; i < toggles.length; i = i + 1) {
+			let toggleID = toggles[i].getAttribute('aria-controls');
+			if (doc.getElementById(toggleID)) {
+				let togglecontent = doc.getElementById(toggleID);
+				togglecontent.setAttribute('aria-hidden', 'true');
+				togglecontent.setAttribute('tabindex', '-1');
+				toggles[i].setAttribute('aria-expanded', 'false');
+			}
+		}
+		function toggle(ev) {
+			ev = ev || win.event;
+			var target = ev.target || ev.srcElement;
+			if (target.hasAttribute('data-aria-owns')) {
+				let toggleIDs = target.getAttribute('data-aria-owns').match(/[^ ]+/g);
+				toggleIDs.forEach(toggleID => {
+					if (doc.getElementById(toggleID)) {
+						ev.preventDefault();
+						let togglecontent = doc.getElementById(toggleID);
+						if (togglecontent.getAttribute('aria-hidden') == 'true') {
+							togglecontent.setAttribute('aria-hidden', 'false');
+							target.setAttribute('aria-expanded', 'true');
+							if (target.tagName == 'A') {
+								togglecontent.focus();
+							}
+						} else {
+							togglecontent.setAttribute('aria-hidden', 'true');
+							target.setAttribute('aria-expanded', 'false');
+						}
+					}
+				})
+			}
+		}
+		doc.addEventListener('click', toggle, false);
+	}(this, this.document));
+	</script>
+`)
 	fmt.wprintf(w, "</div></body>\n</html>\n")
 }
 
@@ -255,7 +300,7 @@ write_core_directory :: proc(w: io.Writer) {
 
 	fmt.wprintln(w, "<h2>Directories</h2>")
 
-	fmt.wprintln(w, "\t<table>")
+	fmt.wprintln(w, "\t<table class=\"documentation-directory\">")
 	fmt.wprintln(w, "\t\t<tbody>")
 
 	for dir := root.first_child; dir != nil; dir = dir.next {
@@ -264,7 +309,7 @@ write_core_directory :: proc(w: io.Writer) {
 			for child := dir.first_child; child != nil; child = child.next {
 				fmt.wprintf(w, "pkg-%s ", str(child.pkg.name))
 			}
-			fmt.wprint(w, `" class="directory-pkg"><td class="pkg-name" data-aria-owns="`)
+			fmt.wprint(w, `" class="directory-pkg"><td class="pkg-line pkg-name" data-aria-owns="`)
 			for child := dir.first_child; child != nil; child = child.next {
 				fmt.wprintf(w, "pkg-%s ", str(child.pkg.name))
 			}
@@ -278,32 +323,33 @@ write_core_directory :: proc(w: io.Writer) {
 		} else {
 			fmt.wprintf(w, "%s", dir.name)
 		}
-		fmt.wprintf(w, "</td>")
+		io.write_string(w, `</td>`)
+		io.write_string(w, `<td class="pkg-line pkg-line-doc">`)
 		if dir.pkg != nil {
 			line_doc, _, _ := strings.partition(str(dir.pkg.docs), "\n")
 			line_doc = strings.trim_space(line_doc)
 			if line_doc != "" {
-				io.write_string(w, `<td class="pkg-line-doc">`)
 				write_doc_line(w, line_doc)
-				io.write_string(w, `</td>`)
 			}
 		}
+		io.write_string(w, `</td>`)
 		fmt.wprintf(w, "</tr>\n")
 
 		for child := dir.first_child; child != nil; child = child.next {
 			assert(child.pkg != nil)
-			fmt.wprintf(w, `<tr id="pkg-%s" class="directory-pkg directory-child"><td class="pkg-name">`, str(child.pkg.name))
+			fmt.wprintf(w, `<tr id="pkg-%s" class="directory-pkg directory-child"><td class="pkg-line pkg-name">`, str(child.pkg.name))
 			fmt.wprintf(w, `<a href="/core/%s/">%s</a>`, child.path, child.name)
-			fmt.wprintf(w, "</td>")
+			io.write_string(w, `</td>`)
 
 			line_doc, _, _ := strings.partition(str(child.pkg.docs), "\n")
 			line_doc = strings.trim_space(line_doc)
+			io.write_string(w, `<td class="pkg-line pkg-line-doc">`)
 			if line_doc != "" {
-				io.write_string(w, `<td class="pkg-line-doc">`)
 				write_doc_line(w, line_doc)
-				io.write_string(w, `</td>`)
 			}
+			io.write_string(w, `</td>`)
 
+			fmt.wprintf(w, "</td>")
 			fmt.wprintf(w, "</tr>\n")
 		}
 	}
@@ -314,7 +360,7 @@ write_core_directory :: proc(w: io.Writer) {
 
 is_entity_blank :: proc(e: doc.Entity_Index) -> bool {
 	name := str(entities[e].name)
-	return name == "" || name == "_"
+	return name == ""
 }
 
 write_where_clauses :: proc(w: io.Writer, where_clauses: []doc.String) {
@@ -348,6 +394,12 @@ write_type :: proc(using writer: ^Type_Writer, type: doc.Type, flags: Write_Type
 	write_param_entity :: proc(using writer: ^Type_Writer, e: ^doc.Entity, flags: Write_Type_Flags, name_width := 0) {
 		name := str(e.name)
 
+		write_padding :: proc(w: io.Writer, name: string, name_width: int) {
+			for _ in 0..<name_width-len(name) {
+				io.write_byte(w, ' ')
+			}
+		}
+
 		if .Param_Using     in e.flags { io.write_string(w, "using ")      }
 		if .Param_Const     in e.flags { io.write_string(w, "#const ")     }
 		if .Param_Auto_Cast in e.flags { io.write_string(w, "#auto_cast ") }
@@ -385,6 +437,7 @@ write_type :: proc(using writer: ^Type_Writer, type: doc.Type, flags: Write_Type
 				generic_scope[name] = true
 				if !is_type_untyped(the_type) {
 					io.write_string(w, ": ")
+					write_padding(w, name, name_width)
 					write_type(writer, the_type, type_flags)
 					io.write_string(w, " = ")
 					io.write_string(w, init_string)
@@ -398,6 +451,7 @@ write_type :: proc(using writer: ^Type_Writer, type: doc.Type, flags: Write_Type
 				if name != "" {
 					io.write_string(w, name)
 					io.write_string(w, ": ")
+					write_padding(w, name, name_width)
 				}
 				write_type(writer, the_type, type_flags)
 			case .Type_Name:
@@ -405,6 +459,7 @@ write_type :: proc(using writer: ^Type_Writer, type: doc.Type, flags: Write_Type
 				io.write_string(w, name)
 				generic_scope[name] = true
 				io.write_string(w, ": ")
+				write_padding(w, name, name_width)
 				if the_type.kind == .Generic {
 					io.write_string(w, "typeid")
 					if ts := array(the_type.types); len(ts) == 1 {
diff --git a/tools/odin-html-docs/style.css b/tools/odin-html-docs/style.css
index cf43a7199..c83a046a8 100644
--- a/tools/odin-html-docs/style.css
+++ b/tools/odin-html-docs/style.css
@@ -1,22 +1,54 @@
-* {
+html {
 	font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji";
 }
 
-
 .container {
 	max-width: 60em;
 	margin: 0 auto;
 	padding-left: 0.01em 1em;
 }
 
-.directory-pkg {
-	width: 20em;
+table.documentation-directory {
+	/*border: 1px solid #ccc!important;*/
+	table-layout: fixed;
+	border-collapse: collapse;
 }
 
-.directory-child .pkg-name {
+.documentation-directory tr {
+	padding-left: 1em!important;
+	border-top: 1px solid #ccc!important;
+	border-bottom: 1px solid #ccc!important;
+}
+
+.documentation-directory td {
+	padding: 0.25em 0.5em;
+}
+.directory-child td {
+	padding-left: 2em!important;
+}
+
+.directory-child td+td {
 	position: relative;
-	left: 2em;
-	width: 18em;
+	left: -1.5em!important;
+	padding-right: 0;
+}
+.pkg-line-doc {
+	color: #444;
+}
+
+.documentation-directory tr[aria-controls]:hover {
+	background-color: #eee;
+}
+
+.documentation-directory tr[aria-expanded=true] td.pkg-name:before {
+	content: "\2193";
+}
+.documentation-directory tr[aria-expanded=false] td.pkg-name:before {
+	content: "\2192"!important;
+}
+
+.documentation-directory tr[aria-hidden=true] {
+	display: none;
 }
 
 pre {
@@ -84,4 +116,21 @@ ul.documentation-breadcrumb li+li:before {
 	border: 1px solid #c6c8ca;
 	border-radius: 0.25rem;
 	padding: 0.125rem;
+}
+
+.documentation-directory {
+	width:  100%;
+}
+
+.documentation-directory tr {
+	/*background-color: #999;*/
+}
+
+
+.documentation-directory tr[aria-controls] {
+	cursor: pointer;
+}
+
+.documentation-directory tr.hidden {
+	display: none;
 }
\ No newline at end of file