Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php	(revision 4251)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php	(working copy)
@@ -20,10 +20,11 @@
 	// If the Handbook TOC is available, use it.
 	if ( class_exists( 'WPorg_Handbook_TOC' ) ) :
 		$TOC = new \WPorg_Handbook_TOC( get_parsed_post_types(), array(
-			'header_text' => __( 'Table of Contents', 'wporg' )
+			'header_text' => __( 'Contents', 'wporg' )
 		) );
 
-		$content = $TOC->add_toc( $content );
+		$content = '<div class="content-toc">' . $TOC->add_toc( $content ) . '</div>';
+
 	endif;
 	?>
 
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss	(revision 4251)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss	(working copy)
@@ -1091,17 +1091,23 @@
 			margin-top: 30px;
 		}
 		.table-of-contents {
-			width: 300px;
-
+			border: none;
+			width: 260px;
+			margin-left: 30px;
+			h2 {
+				padding: 3px 0;
+			}
 			ul {
 				margin-top: 6px;
 			}
 		}
 		ul.items {
+			margin: 1em 20px !important;
 			li {
 				padding-bottom: 0px !important;
 			}
 			a {
+				color: #21759b !important;
 				&:hover {
 					color: #d54e21 !important;
 				}
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css	(revision 4251)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css	(working copy)
@@ -1486,17 +1486,31 @@
 }
 
 .devhub-wrap .wp-parser-class .table-of-contents, .devhub-wrap .wp-parser-function .table-of-contents, .devhub-wrap .wp-parser-hook .table-of-contents, .devhub-wrap .wp-parser-method .table-of-contents {
-  width: 300px;
+  border: none;
+  width: 260px;
+  margin-left: 30px;
 }
 
+.devhub-wrap .wp-parser-class .table-of-contents h2, .devhub-wrap .wp-parser-function .table-of-contents h2, .devhub-wrap .wp-parser-hook .table-of-contents h2, .devhub-wrap .wp-parser-method .table-of-contents h2 {
+  padding: 3px 0;
+}
+
 .devhub-wrap .wp-parser-class .table-of-contents ul, .devhub-wrap .wp-parser-function .table-of-contents ul, .devhub-wrap .wp-parser-hook .table-of-contents ul, .devhub-wrap .wp-parser-method .table-of-contents ul {
   margin-top: 6px;
 }
 
+.devhub-wrap .wp-parser-class ul.items, .devhub-wrap .wp-parser-function ul.items, .devhub-wrap .wp-parser-hook ul.items, .devhub-wrap .wp-parser-method ul.items {
+  margin: 1em 20px !important;
+}
+
 .devhub-wrap .wp-parser-class ul.items li, .devhub-wrap .wp-parser-function ul.items li, .devhub-wrap .wp-parser-hook ul.items li, .devhub-wrap .wp-parser-method ul.items li {
   padding-bottom: 0px !important;
 }
 
+.devhub-wrap .wp-parser-class ul.items a, .devhub-wrap .wp-parser-function ul.items a, .devhub-wrap .wp-parser-hook ul.items a, .devhub-wrap .wp-parser-method ul.items a {
+  color: #21759b !important;
+}
+
 .devhub-wrap .wp-parser-class ul.items a:hover, .devhub-wrap .wp-parser-function ul.items a:hover, .devhub-wrap .wp-parser-hook ul.items a:hover, .devhub-wrap .wp-parser-method ul.items a:hover {
   color: #d54e21 !important;
 }