diff --git a/books.html b/books.html
index 860b8c5..db13b14 100644
--- a/books.html
+++ b/books.html
@@ -217,7 +217,7 @@
             <div class="site-logo"><a href="/">Arjun Vinod</a></div>
             <div class="header-right">
                 <div class="menu-wrapper">
-                    <button class="menu-button" onclick="toggleMenu()" aria-label="Menu" aria-haspopup="true" aria-expanded="false" aria-controls="menu-dropdown">
+                    <button class="menu-button" aria-label="Menu" aria-haspopup="true" aria-expanded="false" aria-controls="menu-dropdown">
                         <i class="fas fa-bars"></i>
                     </button>
                     <nav class="menu-dropdown" id="menu-dropdown" role="navigation" aria-label="Primary Navigation">
@@ -225,7 +225,7 @@
                     </nav>
                 </div>
                 <div class="theme-toggle-wrapper">
-                    <button class="theme-toggle" onclick="toggleTheme()" aria-label="Toggle theme" role="switch" aria-checked="false">
+                    <button class="theme-toggle" aria-label="Toggle theme" role="switch" aria-checked="false">
                         <div class="theme-toggle-slider">
                             <i class="fas fa-moon"></i>
                         </div>
diff --git a/index.html b/index.html
index cbfc18f..9bf4a3e 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@
             <div class="site-logo"><a href="/">Arjun Vinod</a></div>
             <div class="header-right">
                 <div class="menu-wrapper">
-                    <button class="menu-button" onclick="toggleMenu()" aria-label="Menu" aria-haspopup="true" aria-expanded="false" aria-controls="menu-dropdown">
+                    <button class="menu-button" aria-label="Menu" aria-haspopup="true" aria-expanded="false" aria-controls="menu-dropdown">
                         <i class="fas fa-bars"></i>
                     </button>
                     <nav class="menu-dropdown" id="menu-dropdown" role="navigation" aria-label="Primary Navigation">
@@ -93,7 +93,7 @@
                     </nav>
                 </div>
                 <div class="theme-toggle-wrapper">
-                    <button class="theme-toggle" onclick="toggleTheme()" aria-label="Toggle theme" role="switch" aria-checked="false">
+                    <button class="theme-toggle" aria-label="Toggle theme" role="switch" aria-checked="false">
                         <div class="theme-toggle-slider">
                             <i class="fas fa-moon"></i>
                         </div>
diff --git a/js/menu.js b/js/menu.js
index f8ab67a..0311a8d 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -21,6 +21,9 @@ document.addEventListener('DOMContentLoaded', function() {
     
     if (!menuWrapper || !dropdown || !btn) return;
     
+    // Attach event listener to menu button
+    btn.addEventListener('click', toggleMenu);
+    
     // Close dropdown when clicking outside
     document.addEventListener('click', function(event) {
         if (!menuWrapper.contains(event.target)) {
diff --git a/js/theme.js b/js/theme.js
index 4353117..b358af9 100644
--- a/js/theme.js
+++ b/js/theme.js
@@ -35,10 +35,11 @@ window.addEventListener('DOMContentLoaded', () => {
         console.warn('Theme toggle icon element not found');
     }
     
-    // Set initial aria-label
+    // Set initial aria-label and attach event listener
     const btn = document.querySelector('.theme-toggle');
     if (btn) {
         btn.setAttribute('aria-label', theme === 'light' ? 'Switch to dark mode' : 'Switch to light mode');
         btn.setAttribute('aria-checked', theme === 'dark' ? 'true' : 'false');
+        btn.addEventListener('click', toggleTheme);
     }
 });