diff --git a/doc/_static/css/custom.css b/doc/_static/css/custom.css
index 01bb9816c..38ea33d70 100644
--- a/doc/_static/css/custom.css
+++ b/doc/_static/css/custom.css
@@ -115,6 +115,11 @@ img.right-image {
     width:100%;
     height:100%;
 }
+/* Make signatures look nice */
+.sig:not(.sig-inline) {
+    /* Highlight even when not hovering */
+    background: var(--color-api-background-hover);
+}
 /* Make Function API look nice */
 .sig-param .n:first-of-type {
     margin-left: 10px;
diff --git a/doc/conf.py b/doc/conf.py
index c3fdbc959..a2f981ef1 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -35,6 +35,7 @@
     'undoc-members': True,
     'show-inheritance': True
 }
+toc_object_entries_show_parents = 'hide'
 
 sys.path.insert(0, os.path.abspath('..'))
 sys.path.insert(0, os.path.abspath('../arcade'))
diff --git a/util/template_quick_index.rst b/util/template_quick_index.rst
index 2f440e0f5..4dd0b93a4 100644
--- a/util/template_quick_index.rst
+++ b/util/template_quick_index.rst
@@ -6,14 +6,6 @@
           "paging":   false,
           "dom": '<"bottom"flp><"clear">'
         } );
-        $('table#quickapigui').DataTable( {
-          "paging":   false,
-          "dom": '<"bottom"flp><"clear">'
-        } );
-        $('table#tilemap').DataTable( {
-          "paging":   false,
-          "dom": '<"bottom"flp><"clear">'
-        } );
     } );
     </script>
 
diff --git a/util/update_quick_index.py b/util/update_quick_index.py
index b0b914fd9..30ec75f88 100644
--- a/util/update_quick_index.py
+++ b/util/update_quick_index.py
@@ -244,10 +244,6 @@ def process_directory(directory: Path, quick_index_file):
                 quick_index_file.write(f"   * - :py:class:`{full_class_name}`\n")
                 quick_index_file.write(f"     - {title}\n")
 
-                api_file.write(f"{full_class_name}\n")
-                underline = "^" * len(full_class_name)
-                api_file.write(f"{underline}\n\n")
-
                 api_file.write(f".. autoclass:: {full_class_name}\n")
                 api_file.write("    :members:\n")
                 # api_file.write(f"    :member-order: groupwise\n")
@@ -272,10 +268,6 @@ def process_directory(directory: Path, quick_index_file):
                 quick_index_file.write(f"   * - :py:func:`{full_class_name}`\n")
                 quick_index_file.write(f"     - {title}\n")
 
-                api_file.write(f"{full_class_name}\n")
-                underline = "^" * len(full_class_name)
-                api_file.write(f"{underline}\n\n")
-
                 api_file.write(f".. autofunction:: {full_class_name}\n\n")
 
                 # print(f"  Function {item}")
@@ -302,26 +294,6 @@ def include_template(text_file):
    * - Name
      - Group"""
 
-table_header_gui = """
-.. list-table::
-   :widths: 50 50
-   :header-rows: 1
-   :name: quickapigui
-   :class: display
-
-   * - Name
-     - Group"""
-
-table_header_tiled = """
-.. list-table::
-   :widths: 50 50
-   :header-rows: 1
-   :name: quickapitiled
-   :class: display
-
-   * - Name
-     - Group"""
-
 
 def clear_api_directory():
     """
@@ -350,27 +322,10 @@ def main():
     process_directory(ROOT / "arcade/texture", text_file)
     process_directory(ROOT / "arcade/texture_atlas", text_file)
     process_directory(ROOT / "arcade/text", text_file)
-
-    # text_file.write(f"The ``arcade.gl`` module\n")
-    # text_file.write(f"-------------------------\n\n")
     # process_directory(Path("../arcade/gl"), text_file)
-
-    text_file.write("\n\n")
-    text_file.write("The arcade.gui module\n")
-    text_file.write("---------------------\n\n")
-
-    text_file.write(table_header_gui)
-
     process_directory(ROOT / "arcade/gui", text_file)
     process_directory(ROOT / "arcade/gui/widgets", text_file)
     process_directory(ROOT / "arcade/gui/property", text_file)
-
-    text_file.write("\n\n")
-    text_file.write("The arcade.tilemap module\n")
-    text_file.write("-------------------------\n\n")
-
-    text_file.write(table_header_tiled)
-
     process_directory(ROOT / "arcade/tilemap", text_file)
 
     text_file.close()