diff --git a/src/assets/react.svg b/src/assets/react.svg
deleted file mode 100644
index 6c87de9..0000000
--- a/src/assets/react.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
index 3d5b096..c13e712 100644
--- a/src/components/Navbar.jsx
+++ b/src/components/Navbar.jsx
@@ -1,13 +1,15 @@
 import React, { useState, useEffect } from 'react';
 import { NavLink, Link, useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { Languages } from 'lucide-react';
+import { Languages, Sun, Moon } from 'lucide-react';
+import { useTheme } from '../hooks/useTheme';
 
 const Navbar = () => {
     const [isOpen, setIsOpen] = useState(false);
     const [scrolled, setScrolled] = useState(false);
     const location = useLocation();
     const { t, i18n } = useTranslation();
+    const { theme, toggleTheme } = useTheme();
 
     const toggleLanguage = () => {
         i18n.changeLanguage(i18n.language === 'en' ? 'fr' : 'en');
@@ -61,6 +63,9 @@ const Navbar = () => {
                         <Languages size={16} />
                         {i18n.language === 'en' ? 'FR' : 'EN'}
                     </button>
+                    <button onClick={toggleTheme} className="theme-toggle" aria-label="Toggle theme">
+                        {theme === 'dark' ? <Sun size={18} /> : <Moon size={18} />}
+                    </button>
                 </div>
 
                 {/* Mobile drawer overlay */}
@@ -75,6 +80,12 @@ const Navbar = () => {
                     >
                         &times;
                     </button>
+                    <div className="nav-drawer-header">
+                        <Link to="/" className="nav-logo" onClick={() => setIsOpen(false)}>
+                            <img src="/images/branding/python-cameroon-logo.webp" alt="PyCon Cameroon Logo" />
+                            <span>PyCon CM</span>
+                        </Link>
+                    </div>
                     <div className="nav-drawer-links">
                         <NavLink to="/about" className={({ isActive }) => isActive ? "active" : ""}>{t('nav.about')}</NavLink>
                         <NavLink to="/speakers" className={({ isActive }) => isActive ? "active" : ""}>{t('nav.speakers')}</NavLink>
@@ -85,10 +96,15 @@ const Navbar = () => {
                             <img src="/images/partners/canonical-cm.webp" alt="" style={{ width: '22px', height: '22px', objectFit: 'contain', borderRadius: '50%' }} />
                             {t('nav.ubucon')}
                         </NavLink>
-                        <button onClick={toggleLanguage} className="lang-toggle" aria-label="Toggle language">
-                            <Languages size={16} />
-                            {i18n.language === 'en' ? 'FR' : 'EN'}
-                        </button>
+                        <div className="nav-drawer-actions">
+                            <button onClick={toggleLanguage} className="lang-toggle" aria-label="Toggle language">
+                                <Languages size={18} />
+                                {i18n.language === 'en' ? 'FR' : 'EN'}
+                            </button>
+                            <button onClick={toggleTheme} className="theme-toggle" aria-label="Toggle theme">
+                                {theme === 'dark' ? <Sun size={20} /> : <Moon size={20} />}
+                            </button>
+                        </div>
                     </div>
                 </div>
 
diff --git a/src/components/UbuConMap.jsx b/src/components/UbuConMap.jsx
index c080057..9864c0a 100644
--- a/src/components/UbuConMap.jsx
+++ b/src/components/UbuConMap.jsx
@@ -13,10 +13,30 @@ const ubuntuIcon = new L.DivIcon({
 
 const CAMEROON_CENTER = [5.9631, 10.1591];
 
+const TILES = {
+    dark: {
+        url: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png',
+        attribution: '&copy; <a href="https://carto.com/">CARTO</a> &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>',
+    },
+    light: {
+        url: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png',
+        attribution: '&copy; <a href="https://carto.com/">CARTO</a> &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>',
+    },
+};
+
 const UbuConMap = () => {
     const [events, setEvents] = useState([]);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
+    const [theme, setTheme] = useState(document.documentElement.getAttribute('data-theme') || 'dark');
+
+    useEffect(() => {
+        const observer = new MutationObserver(() => {
+            setTheme(document.documentElement.getAttribute('data-theme') || 'dark');
+        });
+        observer.observe(document.documentElement, { attributes: true, attributeFilter: ['data-theme'] });
+        return () => observer.disconnect();
+    }, []);
 
     useEffect(() => {
         fetch('https://ubucon.org/events.json')
@@ -35,6 +55,8 @@ const UbuConMap = () => {
             });
     }, []);
 
+    const tile = TILES[theme] || TILES.dark;
+
     if (loading) {
         return (
             <div style={{ height: '450px', display: 'flex', alignItems: 'center', justifyContent: 'center', background: 'var(--color-dark-alt)', borderRadius: 'var(--radius-md)' }}>
@@ -55,12 +77,13 @@ const UbuConMap = () => {
         <MapContainer
             center={CAMEROON_CENTER}
             zoom={4}
-            style={{ height: '450px', width: '100%', borderRadius: 'var(--radius-md)' }}
+            style={{ height: '450px', width: '100%', borderRadius: 'var(--radius-md)', zIndex: 0 }}
             scrollWheelZoom={true}
         >
             <TileLayer
-                attribution='&copy; <a href="https://carto.com/">CARTO</a> &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'
-                url="https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png"
+                key={theme}
+                attribution={tile.attribution}
+                url={tile.url}
             />
             {events.map((evt, i) => (
                 <Marker key={i} position={evt.coordinates} icon={ubuntuIcon}>
diff --git a/src/hooks/useTheme.js b/src/hooks/useTheme.js
new file mode 100644
index 0000000..ed44023
--- /dev/null
+++ b/src/hooks/useTheme.js
@@ -0,0 +1,22 @@
+import { useState, useEffect, useCallback } from 'react';
+
+function getInitialTheme() {
+  const saved = localStorage.getItem('pycon-theme');
+  if (saved === 'light' || saved === 'dark') return saved;
+  return 'dark';
+}
+
+export function useTheme() {
+  const [theme, setTheme] = useState(getInitialTheme);
+
+  useEffect(() => {
+    document.documentElement.setAttribute('data-theme', theme);
+    localStorage.setItem('pycon-theme', theme);
+  }, [theme]);
+
+  const toggleTheme = useCallback(() => {
+    setTheme(prev => prev === 'dark' ? 'light' : 'dark');
+  }, []);
+
+  return { theme, toggleTheme };
+}
diff --git a/src/index.css b/src/index.css
index d434a84..c24e753 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,8 +1,10 @@
 :root {
-    /* Primary Colors */
+    /* Primary Colors (Dark theme — default) */
     --color-black: #0d0d0d;
     --color-dark: #1a1a1a;
     --color-dark-alt: #242424;
+    --color-border: rgba(224, 122, 36, 0.15);
+    --color-surface: #1a1a1a;
 
     /* Background Images */
     --bg-tribal: url('/images/patterns/97568bbec02a103e305ee0d2bbaa6106.webp');
@@ -11,7 +13,7 @@
     --bg-drums: url('/images/patterns/African.webp');
     --bg-silver: url('/images/patterns/ce62691b36daffc632c28793c5a28ba3.webp');
 
-    /* Accent Colors*/
+    /* Accent Colors */
     --color-orange: #e07a24;
     --color-orange-bright: #f59e0b;
     --color-yellow: #f5c518;
@@ -68,6 +70,289 @@
     --font-display: var(--font-tribal);
 }
 
+/* ===================================
+   Light Theme Override
+   =================================== */
+[data-theme="light"] {
+    --color-black: #ffffff;
+    --color-dark: #f5f5f5;
+    --color-dark-alt: #e8e8e8;
+    --color-border: rgba(0, 0, 0, 0.1);
+    --color-surface: #ffffff;
+
+    --color-text-primary: #1a1a1a;
+    --color-text-secondary: rgba(0, 0, 0, 0.7);
+    --color-text-muted: rgba(0, 0, 0, 0.5);
+
+    --gradient-dark: none;
+
+    --shadow-sm: 0 2px 4px rgba(0, 0, 0, 0.08);
+    --shadow-md: 0 4px 12px rgba(0, 0, 0, 0.1);
+    --shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.12);
+    --shadow-glow: 0 0 20px rgba(224, 122, 36, 0.15);
+}
+
+[data-theme="light"] body {
+    background: #ffffff;
+    color: #1a1a1a;
+}
+
+[data-theme="light"] .navbar {
+    background: rgba(255, 255, 255, 0.95);
+    backdrop-filter: blur(10px);
+}
+
+[data-theme="light"] .navbar.scrolled {
+    background: rgba(255, 255, 255, 0.98);
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+[data-theme="light"] .card {
+    background: #ffffff;
+    border: 1px solid rgba(0, 0, 0, 0.08);
+}
+
+[data-theme="light"] .card:hover {
+    border-color: rgba(224, 122, 36, 0.3);
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
+}
+
+[data-theme="light"] .card.bg-dark {
+    background: #f5f5f5;
+}
+
+[data-theme="light"] .bg-dark {
+    background: #f5f5f5;
+}
+
+[data-theme="light"] .hero-background {
+    opacity: 0.15;
+    filter: blur(2px) saturate(0.6);
+}
+
+[data-theme="light"] .hero-overlay {
+    background: rgba(245, 245, 245, 0.75) !important;
+}
+
+[data-theme="light"] .hero-title,
+[data-theme="light"] .hero-subtitle,
+[data-theme="light"] .hero-date {
+    color: #1a1a1a;
+}
+
+[data-theme="light"] .hero-title .highlight {
+    color: var(--color-orange);
+}
+
+[data-theme="light"] .footer {
+    background-color: #1a1a1a !important;
+    background-image: var(--bg-tribal) !important;
+    background-size: cover !important;
+    background-blend-mode: overlay !important;
+    color: #ffffff;
+}
+
+[data-theme="light"] .footer::before {
+    background: radial-gradient(circle at center, transparent, #0d0d0d) !important;
+}
+
+[data-theme="light"] .footer .footer-description,
+[data-theme="light"] .footer .footer-links a,
+[data-theme="light"] .footer .footer-bottom,
+[data-theme="light"] .footer .footer-bottom a,
+[data-theme="light"] .footer p {
+    color: rgba(255, 255, 255, 0.8);
+}
+
+[data-theme="light"] .footer .footer-title {
+    color: #ffffff;
+}
+
+[data-theme="light"] .footer .social-link {
+    color: rgba(255, 255, 255, 0.8);
+}
+
+[data-theme="light"] .footer .tribal-border {
+    filter: none;
+    opacity: 0.6;
+}
+
+[data-theme="light"] .page-header:not(.page-header-dark) {
+    background: #f0f0f0 !important;
+    color: #1a1a1a;
+}
+
+[data-theme="light"] .page-header:not(.page-header-dark) h1,
+[data-theme="light"] .page-header:not(.page-header-dark) p {
+    color: #1a1a1a;
+    text-shadow: none;
+}
+
+[data-theme="light"] .page-header-dark h1,
+[data-theme="light"] .page-header-dark p {
+    color: white;
+}
+
+[data-theme="light"] .page-header .text-gradient {
+    background: var(--gradient-primary);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+}
+
+[data-theme="light"] .nav-links a {
+    color: rgba(0, 0, 0, 0.65);
+}
+
+[data-theme="light"] .nav-links a:hover,
+[data-theme="light"] .nav-links a.active {
+    color: var(--color-orange);
+    background: rgba(224, 122, 36, 0.08);
+}
+
+[data-theme="light"] .nav-logo span {
+    color: #1a1a1a;
+}
+
+[data-theme="light"] .alert {
+    border-color: rgba(0, 0, 0, 0.1);
+}
+
+[data-theme="light"] .alert-info {
+    background: rgba(59, 130, 246, 0.06);
+    border-left-color: var(--color-blue);
+}
+
+[data-theme="light"] .alert-warning {
+    background: rgba(245, 158, 11, 0.06);
+    border-left-color: var(--color-orange-bright);
+}
+
+[data-theme="light"] .alert-success {
+    background: rgba(45, 143, 78, 0.06);
+    border-left-color: var(--color-green);
+}
+
+[data-theme="light"] .alert-danger {
+    background: rgba(201, 48, 44, 0.06);
+    border-left-color: var(--color-red);
+}
+
+[data-theme="light"] .btn-secondary {
+    border-color: var(--color-orange);
+    color: var(--color-orange);
+    background: transparent;
+}
+
+[data-theme="light"] .btn-secondary:hover {
+    background: rgba(224, 122, 36, 0.08);
+}
+
+[data-theme="light"] .accordion-header {
+    background: #f0f0f0;
+    color: #1a1a1a;
+}
+
+[data-theme="light"] .accordion-item.active .accordion-header {
+    background: rgba(224, 122, 36, 0.08);
+}
+
+[data-theme="light"] .sponsor-card {
+    background: #ffffff;
+    border: 1px solid rgba(0, 0, 0, 0.08);
+}
+
+[data-theme="light"] .timeline-item {
+    border-left-color: rgba(0, 0, 0, 0.15);
+}
+
+[data-theme="light"] .nav-drawer {
+    background: #ffffff;
+}
+
+[data-theme="light"] .nav-drawer-links a {
+    color: rgba(0, 0, 0, 0.65);
+}
+
+[data-theme="light"] .nav-drawer-links a:hover,
+[data-theme="light"] .nav-drawer-links a.active {
+    color: var(--color-orange);
+    background: rgba(224, 122, 36, 0.08);
+}
+
+[data-theme="light"] .nav-drawer-close {
+    color: #1a1a1a;
+}
+
+[data-theme="light"] .stat-label {
+    color: rgba(0, 0, 0, 0.6);
+}
+
+[data-theme="light"] .tribal-border {
+    filter: none;
+    opacity: 1;
+    background-color: #1a1a1a;
+    background-blend-mode: normal;
+}
+
+[data-theme="light"] .navbar .tribal-border {
+    filter: none;
+    opacity: 1;
+    background-color: #1a1a1a;
+    background-blend-mode: normal;
+}
+
+[data-theme="light"] .lang-toggle {
+    border-color: var(--color-orange);
+    color: var(--color-orange);
+}
+
+[data-theme="light"] .theme-toggle {
+    border-color: rgba(0, 0, 0, 0.2);
+    color: #1a1a1a;
+}
+
+[data-theme="light"] .theme-toggle:hover {
+    background: rgba(0, 0, 0, 0.05);
+    border-color: rgba(0, 0, 0, 0.3);
+}
+
+/* Leaflet z-index containment */
+.leaflet-container {
+    z-index: 0 !important;
+}
+
+.leaflet-pane,
+.leaflet-control {
+    z-index: auto !important;
+}
+
+.leaflet-top,
+.leaflet-bottom {
+    z-index: 1 !important;
+}
+
+/* Theme toggle button */
+.theme-toggle {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    background: transparent;
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    color: var(--color-text-secondary);
+    padding: 4px 8px;
+    border-radius: var(--radius-sm);
+    cursor: pointer;
+    font-size: 1rem;
+    transition: background 0.2s, color 0.2s, border-color 0.2s;
+    line-height: 1;
+}
+
+.theme-toggle:hover {
+    background: rgba(255, 255, 255, 0.1);
+    border-color: rgba(255, 255, 255, 0.3);
+}
+
 /* Typography Utilities */
 .font-tribal {
     font-family: var(--font-tribal);
@@ -447,7 +732,7 @@ p {
         position: fixed;
         inset: 0;
         background: rgba(0, 0, 0, 0.6);
-        z-index: 999;
+        z-index: 9998;
         backdrop-filter: blur(4px);
     }
 
@@ -460,10 +745,11 @@ p {
         width: 100%;
         height: 100dvh;
         background: var(--color-dark);
-        z-index: 1000;
+        z-index: 9999;
         transform: translateX(100%);
         transition: transform 0.35s cubic-bezier(0.4, 0, 0.2, 1);
-        padding: var(--spacing-xl) var(--spacing-lg);
+        padding: var(--spacing-sm) var(--spacing-lg) var(--spacing-md);
+        overflow: hidden;
     }
 
     .nav-drawer.open {
@@ -472,8 +758,8 @@ p {
 
     .nav-drawer-close {
         position: absolute;
-        top: var(--spacing-md);
-        right: var(--spacing-md);
+        top: var(--spacing-sm);
+        right: var(--spacing-lg);
         background: none;
         border: none;
         color: var(--color-text);
@@ -491,8 +777,9 @@ p {
     .nav-drawer-links {
         display: flex;
         flex-direction: column;
-        gap: var(--spacing-sm);
-        margin-top: var(--spacing-xl);
+        gap: var(--spacing-xs);
+        margin-top: var(--spacing-sm);
+        flex: 1;
     }
 
     .nav-drawer-links a {
@@ -511,11 +798,45 @@ p {
         background: rgba(224, 122, 36, 0.1);
     }
 
-    .nav-drawer-links .lang-toggle {
-        margin-top: var(--spacing-sm);
-        align-self: flex-start;
+    .nav-drawer-header {
+        display: flex;
+        align-items: center;
+        padding: 0;
+        margin-top: var(--spacing-md);
+        margin-bottom: 0;
+    }
+
+    .nav-drawer-header .nav-logo {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+    }
+
+    .nav-drawer-header .nav-logo img {
+        width: 36px;
+        height: 36px;
+    }
+
+    .nav-drawer-header .nav-logo span {
+        font-family: var(--font-tribal);
+        font-size: 1.1rem;
+        color: var(--color-orange);
+    }
+
+    .nav-drawer-actions {
+        display: flex;
+        gap: var(--spacing-sm);
+        margin-top: auto;
+        padding-top: var(--spacing-sm);
+        border-top: 1px solid var(--color-border);
+    }
+
+    .nav-drawer-actions .lang-toggle,
+    .nav-drawer-actions .theme-toggle {
+        flex: 1;
+        justify-content: center;
         font-size: 1rem;
-        padding: 6px 14px;
+        padding: 10px 14px;
     }
 }
 
@@ -583,7 +904,7 @@ p {
 
 .btn-primary {
     background: var(--color-orange);
-    color: var(--color-black);
+    color: #0d0d0d;
     border-color: var(--color-orange-bright);
     box-shadow: 4px 4px 0 rgba(0, 0, 0, 0.5);
     /* Primitive shadow */
diff --git a/src/main.jsx b/src/main.jsx
index d2a93a5..178a6fc 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -5,6 +5,10 @@ import './index.css'
 import './i18n/LanguageContext'
 import App from './App.jsx'
 
+// Set initial theme before render to avoid flash
+const savedTheme = localStorage.getItem('pycon-theme') || 'dark';
+document.documentElement.setAttribute('data-theme', savedTheme);
+
 createRoot(document.getElementById('root')).render(
   <StrictMode>
     <BrowserRouter>
diff --git a/src/pages/UbuCon.jsx b/src/pages/UbuCon.jsx
index 5897edc..16fd942 100644
--- a/src/pages/UbuCon.jsx
+++ b/src/pages/UbuCon.jsx
@@ -18,7 +18,7 @@ const UbuCon = () => {
     return (
         <>
             {/* Page Header */}
-            <header className="page-header" style={{
+            <header className="page-header page-header-dark" style={{
                 background: `linear-gradient(160deg, ${UBUNTU_DARK} 0%, ${UBUNTU_AUBERGINE} 50%, ${UBUNTU_ORANGE} 100%)`,
             }}>
                 <div className="container text-center">