diff --git a/docs/requirements.txt b/docs/requirements.txt
index 8d4f26f551..b072757e4f 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -15,9 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-sphinx
+setuptools
+sphinx>=7.0,<8.0
 sphinx-reredirects
-pydata-sphinx-theme==0.8.0
-myst-parser
+pydata-sphinx-theme>=0.15.0,<0.16.0
+myst-parser>=2.0,<4.0
 maturin
 jinja2
diff --git a/docs/source/_templates/docs-sidebar.html b/docs/source/_templates/docs-sidebar.html
index 0c876a475a..9c9de068fe 100644
--- a/docs/source/_templates/docs-sidebar.html
+++ b/docs/source/_templates/docs-sidebar.html
@@ -24,11 +24,7 @@
 
 <nav class="bd-links" id="bd-docs-nav" aria-label="Main navigation">
   <div class="bd-toc-item active">
-    {% if "python/api" in pagename or "python/generated" in pagename %}
-    {{ generate_nav_html("sidebar", startdepth=0, maxdepth=3, collapse=False, includehidden=True, titles_only=True) }}
-    {% else %}
-    {{ generate_nav_html("sidebar", startdepth=0, maxdepth=4, collapse=False, includehidden=True, titles_only=True) }}
-    {% endif %}
+    {{ toctree(maxdepth=4, collapse=True, includehidden=True, titles_only=True) }}
   </div>
 
   <a class="navbar-brand" href="{{ pathto(master_doc) }}">
diff --git a/docs/source/conf.py b/docs/source/conf.py
index d5b46a0928..7690605c08 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -86,10 +86,11 @@
 html_theme = 'pydata_sphinx_theme'
 
 html_theme_options = {
-    "use_edit_page_button": True,
+    "use_edit_page_button": False,
 }
 
 html_context = {
+    "default_mode": "light",
     "github_user": "apache",
     "github_repo": "datafusion-comet",
     "github_version": "main",