diff --git a/public/collaborators/europython_logo.png b/public/collaborators/europython_logo.png
new file mode 100644
index 0000000..d76c888
Binary files /dev/null and b/public/collaborators/europython_logo.png differ
diff --git a/public/collaborators/pyes_logo.png b/public/collaborators/pyes_logo.png
new file mode 100644
index 0000000..cf7ecd9
Binary files /dev/null and b/public/collaborators/pyes_logo.png differ
diff --git a/public/collaborators/python_logo.png b/public/collaborators/python_logo.png
new file mode 100644
index 0000000..d5dfdc7
Binary files /dev/null and b/public/collaborators/python_logo.png differ
diff --git a/public/collaborators/ub_white.png b/public/collaborators/ub_white.png
new file mode 100644
index 0000000..45a0d43
Binary files /dev/null and b/public/collaborators/ub_white.png differ
diff --git a/src/components/Button.astro b/src/components/Button.astro
index 8163a03..b12697e 100644
--- a/src/components/Button.astro
+++ b/src/components/Button.astro
@@ -13,8 +13,8 @@ const variants = {
   primary: 'bg-orange-500 text-white hover:bg-orange-600',
   secondary: 'bg-amber-400 text-stone-900 hover:bg-amber-500',
   outline: 'outline outline-2 outline-offset-[-2px] outline-orange-500 text-orange-500 hover:bg-orange-50',
-  ghost: 'text-stone-900 dark:text-white hover:bg-gray-100 dark:hover:bg-gray-800',
-}
+  ghost: 'text-stone-900 text-white hover:bg-gray-100 hover:bg-gray-800'
+};
 
 // Map sizes based on exact Figma sizes
 const sizes = {
diff --git a/src/components/Nav.astro b/src/components/Nav.astro
deleted file mode 100644
index efeecc1..0000000
--- a/src/components/Nav.astro
+++ /dev/null
@@ -1,27 +0,0 @@
----
-import Navigation from './Navigation.astro'
-
-/**
- * Nav Component
- *
- * @description Main navigation wrapper that uses the accessible Navigation component
- * This component provides professional-level accessibility following WCAG 2.1 guidelines
- *
- * Keyboard behaviors (inherited from Navigation.astro):
- * - ArrowLeft/ArrowRight: Navigate between top-level menu items
- * - ArrowDown: Open dropdown and navigate down through items
- * - ArrowUp: Navigate up through dropdown items
- * - Escape: Close dropdown/mobile menu and return focus to trigger
- * - Tab: Standard tab navigation with proper focus management
- */
-
-interface Props {
-  lang?: string
-}
-
-const { lang } = Astro.props
----
-
-<header>
-  <Navigation lang={lang} />
-</header>
diff --git a/src/components/home/SectionMain.astro b/src/components/home/SectionMain.astro
index d21cce6..2602d3f 100644
--- a/src/components/home/SectionMain.astro
+++ b/src/components/home/SectionMain.astro
@@ -1,5 +1,5 @@
 ---
-import { texts } from '../../i18n/home'
+import { texts } from '@/i18n/home'
 import CenteredPanel from '../CenteredPanel.astro'
 
 interface Props {
diff --git a/src/components/index.astro b/src/components/index.astro
index 9db6170..f3ece26 100644
--- a/src/components/index.astro
+++ b/src/components/index.astro
@@ -1,5 +1,5 @@
 ---
-import Layout from '../layouts/Layout.astro'
+import Layout from '@/layouts/Layout.astro'
 import SectionMain from './home/SectionMain.astro'
 import SectionSponsors from './home/SectionSponsors.astro'
 
diff --git a/src/pages/constants.ts b/src/constants.ts
similarity index 50%
rename from src/pages/constants.ts
rename to src/constants.ts
index 6857489..efb50d5 100644
--- a/src/pages/constants.ts
+++ b/src/constants.ts
@@ -1 +1,2 @@
 export const SPONSORS_EMAIL = 'sponsors@2026.es.pycon.org'
+export const CONTACT_EMAIL = 'contacto@2026.es.pycon.org'
diff --git a/src/i18n/components/footer/ca.ts b/src/i18n/components/footer/ca.ts
new file mode 100644
index 0000000..c1e193c
--- /dev/null
+++ b/src/i18n/components/footer/ca.ts
@@ -0,0 +1,10 @@
+export const ca = {
+  copyright: 'Copyright © Python España & PyConES 2026 Org',
+  links: [{ label: 'Codi de conducta', href: '/ca/code-of-conduct' }],
+  social: {
+    title: 'Segueix-nos',
+  },
+  collaborators: {
+    title: 'Col·laboren',
+  },
+} as const
diff --git a/src/i18n/components/footer/en.ts b/src/i18n/components/footer/en.ts
new file mode 100644
index 0000000..dcb250d
--- /dev/null
+++ b/src/i18n/components/footer/en.ts
@@ -0,0 +1,10 @@
+export const en = {
+  copyright: 'Copyright © Python España & PyConES 2026 Org',
+  links: [{ label: 'Code of Conduct', href: '/en/code-of-conduct' }],
+  social: {
+    title: 'Follow us',
+  },
+  collaborators: {
+    title: 'Collaborators',
+  },
+} as const
diff --git a/src/i18n/components/footer/es.ts b/src/i18n/components/footer/es.ts
new file mode 100644
index 0000000..1745a26
--- /dev/null
+++ b/src/i18n/components/footer/es.ts
@@ -0,0 +1,10 @@
+export const es = {
+  copyright: 'Copyright © Python España & PyConES 2026 Org',
+  links: [{ label: 'Código de conducta', href: '/es/code-of-conduct' }],
+  social: {
+    title: 'Síguenos en redes',
+  },
+  collaborators: {
+    title: 'Colaboran',
+  },
+} as const
diff --git a/src/i18n/components/footer/index.ts b/src/i18n/components/footer/index.ts
new file mode 100644
index 0000000..98f8310
--- /dev/null
+++ b/src/i18n/components/footer/index.ts
@@ -0,0 +1,9 @@
+import { es } from './es'
+import { en } from './en'
+import { ca } from './ca'
+
+export const footerTexts = {
+  es,
+  en,
+  ca,
+} as const
diff --git a/src/i18n/sponsors/ca.ts b/src/i18n/sponsors/ca.ts
index a1767c5..ce55902 100644
--- a/src/i18n/sponsors/ca.ts
+++ b/src/i18n/sponsors/ca.ts
@@ -409,16 +409,6 @@ export const ca = {
       },
     ],
   },
-  socialLinks: {
-    title: 'Segueix-nos a les xarxes',
-    items: [
-      { icon: '🦋', label: 'Bluesky', url: 'https://bsky.app/profile/es.pycon.org' },
-      { icon: '🐙', label: 'GitHub', url: 'https://github.com/python-spain' },
-      { icon: '𝕏', label: '', url: 'https://x.com/PyConES' },
-      { icon: '💼', label: 'LinkedIn', url: 'https://www.linkedin.com/company/pycones' },
-      { icon: '📸', label: 'Instagram', url: 'https://www.instagram.com/pycon_es' },
-    ],
-  },
   contact: {
     title: 'T’hi apuntes?',
     body: 'T’ho posem fàcil. Escriu-nos explicant-nos quin nivell de patrocini t’interessa o quin pressupost teniu al cap. Nosaltres et guiarem en el procés, resoldrem els teus dubtes i veurem com encaixar la teva marca de la millor forma possible.',
diff --git a/src/i18n/sponsors/en.ts b/src/i18n/sponsors/en.ts
index bf9daf0..bd8e5a2 100644
--- a/src/i18n/sponsors/en.ts
+++ b/src/i18n/sponsors/en.ts
@@ -409,16 +409,7 @@ export const en = {
       },
     ],
   },
-  socialLinks: {
-    title: 'Follow us',
-    items: [
-      { icon: '🦋', label: 'Bluesky', url: 'https://bsky.app/profile/es.pycon.org' },
-      { icon: '🐙', label: 'GitHub', url: 'https://github.com/python-spain' },
-      { icon: '𝕏', label: '', url: 'https://x.com/PyConES' },
-      { icon: '💼', label: 'LinkedIn', url: 'https://www.linkedin.com/company/pycones' },
-      { icon: '📸', label: 'Instagram', url: 'https://www.instagram.com/pycon_es' },
-    ],
-  },
+
   contact: {
     title: 'Interested?',
     body: 'We make it easy. Write to us mentioning which sponsorship level interests you or what budget you have in mind. We will guide you through the process and help your brand fit in the best possible way.',
diff --git a/src/i18n/sponsors/es.ts b/src/i18n/sponsors/es.ts
index d92f0e0..1fa451c 100644
--- a/src/i18n/sponsors/es.ts
+++ b/src/i18n/sponsors/es.ts
@@ -30,6 +30,17 @@ export const es = {
     sunday: 'Domingo',
     sundayBody: 'Más charlas, "charlas relámpago" y la despedida final.',
   },
+  socialLinks: {
+    title: 'Síguenos en redes',
+    items: [
+      { icon: '🦋', label: 'Bluesky', url: 'https://bsky.app/profile/es.pycon.org' },
+      { icon: '🐙', label: 'GitHub', url: 'https://github.com/python-spain' },
+      { icon: '🐘', label: 'Mastodon', url: 'https://fosstodon.org/@pycones' },
+      { icon: '𝕏', label: '', url: 'https://x.com/PyConES' },
+      { icon: '💼', label: 'LinkedIn', url: 'https://www.linkedin.com/company/pycones' },
+      { icon: '📸', label: 'Instagram', url: 'https://www.instagram.com/pycon_es' },
+    ],
+  },
   stats: {
     title: 'La PyConES en números',
     items: [
@@ -409,16 +420,7 @@ export const es = {
       },
     ],
   },
-  socialLinks: {
-    title: 'Síguenos en redes',
-    items: [
-      { icon: '🦋', label: 'Bluesky', url: 'https://bsky.app/profile/es.pycon.org' },
-      { icon: '🐙', label: 'GitHub', url: 'https://github.com/python-spain' },
-      { icon: '𝕏', label: '', url: 'https://x.com/PyConES' },
-      { icon: '💼', label: 'LinkedIn', url: 'https://www.linkedin.com/company/pycones' },
-      { icon: '📸', label: 'Instagram', url: 'https://www.instagram.com/pycon_es' },
-    ],
-  },
+
   contact: {
     title: '¿Te apuntas?',
     body: 'Te lo ponemos fácil. Escríbenos contándonos qué nivel de patrocinio te interesa o qué presupuesto tenéis en mente. Nosotros te guiaremos en el proceso, resolveremos tus dudas y veremos cómo encajar tu marca de la mejor forma posible.',
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index f8cba77..c8c0613 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,6 +1,7 @@
 ---
-import Nav from '../components/Nav.astro'
-import '../style/global.css'
+import Header from './components/Header/Header.astro'
+import Footer from './components/Footer.astro'
+import '@/style/global.css'
 import '@fontsource-variable/jetbrains-mono'
 import '@fontsource-variable/outfit'
 import { ClientRouter } from 'astro:transitions'
@@ -114,22 +115,40 @@ const alternates = [
     <ClientRouter />
 
     <script is:inline>
-      document.documentElement.classList.add('dark')
+      const getThemePreference = () => {
+        if (typeof localStorage !== 'undefined' && localStorage.getItem('theme')) {
+          return localStorage.getItem('theme')
+        }
+        return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
+      }
+      const isDark = getThemePreference() === 'dark'
+      document.documentElement.classList[isDark ? 'add' : 'remove']('dark')
+      document.documentElement.classList[!isDark ? 'add' : 'remove']('light')
+
+      if (typeof localStorage !== 'undefined') {
+        const observer = new MutationObserver(() => {
+          const isDark = document.documentElement.classList.contains('dark')
+          localStorage.setItem('theme', isDark ? 'dark' : 'light')
+        })
+        observer.observe(document.documentElement, { attributes: true, attributeFilter: ['class'] })
+      }
     </script>
   </head>
 
   <body
-    class="bg-pycon-black font-outfit text-pycon-white antialiased h-screen relative transition-colors duration-300"
+    class="bg-pycon-black font-outfit text-pycon-white antialiased min-h-screen relative flex flex-col transition-colors duration-300"
   >
     <div
-      class="fixed inset-0 bg-[url('/images/symbol-black-dark.svg')] bg-size-[80vh] bg-position-[140%_120%] bg-no-repeat opacity-5 pointer-events-none blur transition-colors duration-300"
+      class="fixed inset-0 bg-no-repeat bg-size-[80vh] bg-position-[140%_120%] opacity-5 pointer-events-none blur transition-all duration-300"
+      style="background-image: var(--bg-symbol);"
     >
     </div>
-    <Nav lang={lang as string} />
+    <Header lang={lang as string} />
 
-    <main class="relative z-10 flex flex-col justify-center container mx-auto p-4 md:p-8">
+    <main class="relative grow z-10 flex flex-col justify-center container mx-auto p-4 md:p-8 pt-20">
       <slot />
     </main>
+    <Footer lang={lang as string} />
   </body>
 </html>
 
diff --git a/src/layouts/components/Footer.astro b/src/layouts/components/Footer.astro
new file mode 100644
index 0000000..2479ea4
--- /dev/null
+++ b/src/layouts/components/Footer.astro
@@ -0,0 +1,136 @@
+---
+import { getRelativeLocaleUrl } from 'astro:i18n'
+import { footerTexts } from '@/i18n/components/footer'
+
+interface Props {
+  lang?: string
+}
+
+const { lang: propLang } = Astro.props
+
+// Get current language from URL if prop not provided
+const urlLang = Astro.url.pathname.split('/')[1] || 'es'
+const rawLang = propLang || urlLang
+const validLangs = ['es', 'en', 'ca'] as const
+type Lang = (typeof validLangs)[number]
+const currentLang: Lang = validLangs.includes(rawLang as Lang) ? (rawLang as Lang) : 'es'
+
+const t = footerTexts[currentLang]
+
+const socialLinks = [
+  { icon: '🦋', label: 'Bluesky', url: 'https://bsky.app/profile/es.pycon.org' },
+  { icon: '🐙', label: 'GitHub', url: 'https://github.com/python-spain' },
+  { icon: '𝕏', label: 'X (Twitter)', url: 'https://x.com/PyConES' },
+  { icon: '💼', label: 'LinkedIn', url: 'https://www.linkedin.com/company/pycones' },
+  { icon: '📸', label: 'Instagram', url: 'https://www.instagram.com/pycon_es' },
+]
+
+const collaborators = [
+  {
+    name: 'Python España',
+    logo: '/collaborators/pyes_logo.png',
+    url: 'https://es.python.org/',
+  },
+  // {
+  //   name: 'Python Software Foundation',
+  //   logo: '/collaborators/psf.png',
+  //   url: 'https://www.python.org/psf/',
+  // },
+  {
+    name: 'EuroPython Society',
+    logo: '/collaborators/europython_logo.png',
+    url: 'https://www.europython-society.org/',
+  },
+  {
+    name: 'Universitat de Barcelona',
+    logo: '/collaborators/ub.png',
+    url: 'https://www.ub.edu/',
+  },
+]
+---
+
+<footer
+  class="w-full bg-gray-50 bg-pycon-black py-8 border-t border-pycon-gray-100/10 border-pycon-gray-100/20 text-pycon-black text-pycon-white transition-colors duration-300"
+>
+  <div class="container mx-auto px-4">
+    <!-- Top Row: Brand, Nav, and Social -->
+    <div class="flex flex-col lg:flex-row justify-between items-center gap-8 pb-8">
+      <!-- Brand & Copyright -->
+      <div class="flex flex-col items-center lg:items-start gap-2">
+        <a
+          href={getRelativeLocaleUrl(currentLang, '/')}
+          class="text-2xl font-bold font-outfit tracking-tighter text-pycon-black text-pycon-white hover:text-pycon-yellow transition-colors outline-none focus-visible:text-pycon-yellow"
+        >
+          PyCon<span class="text-pycon-yellow">ES</span>
+        </a>
+        <p class="text-[10px] font-mono text-pycon-black/50 text-pycon-black-50 uppercase tracking-widest text-center lg:text-left">
+          {t.copyright}
+        </p>
+      </div>
+
+      <!-- Navigation & Policies -->
+      <nav class="flex flex-wrap justify-center items-center gap-x-8 gap-y-2 text-sm font-medium">
+        {
+          t.links.map((link) => (
+            <a
+              href={link.href}
+              class="text-pycon-black/80 text-pycon-white/80 hover:text-pycon-red hover:text-pycon-red transition-colors relative group outline-none focus-visible:text-pycon-red"
+            >
+              {link.label}
+              <span class="absolute -bottom-1 left-0 w-0 h-0.5 bg-pycon-red transition-all group-hover:w-full group-focus-visible:w-full" />
+            </a>
+          ))
+        }
+      </nav>
+
+      <!-- Social Links -->
+      <div class="flex flex-col items-center lg:items-end gap-2 text-pycon-black/50 text-pycon-black-50 uppercase tracking-[0.2em] font-bold">
+        <span class="text-[9px]">
+          {t.social.title}
+        </span>
+        <div class="flex gap-2">
+          {
+            socialLinks.map((link) => (
+              <a
+                href={link.url}
+                target="_blank"
+                rel="noopener noreferrer"
+                class="group flex h-9 w-9 items-center justify-center rounded-lg bg-pycon-gray-100/10 bg-pycon-gray-100/20 border border-pycon-gray-100/10 text-pycon-black text-pycon-white transition-all hover:bg-pycon-yellow hover:text-pycon-black hover:scale-110 outline-none focus-visible:bg-pycon-yellow focus-visible:text-pycon-black"
+                aria-label={link.label}
+                title={link.label}
+              >
+                <span class="text-lg">{link.icon}</span>
+              </a>
+            ))
+          }
+        </div>
+      </div>
+    </div>
+
+    <!-- Bottom Row: Collaborators -->
+    <div class="pt-6 border-t border-pycon-gray-100/10 flex flex-col md:flex-row items-center justify-center gap-6 text-pycon-black/50 text-pycon-black-50 uppercase tracking-[0.2em] font-bold">
+      <span class="text-[9px] shrink-0">
+        {t.collaborators.title}
+      </span>
+      <div class="flex flex-wrap justify-center items-center gap-x-10 gap-y-4">
+        {
+          collaborators.map((collab) => (
+            <a
+              href={collab.url}
+              target="_blank"
+              rel="noopener noreferrer"
+              class="group transition-all hover:scale-105 outline-none focus-visible:ring-1 focus-visible:ring-pycon-orange rounded-md p-1"
+              title={collab.name}
+            >
+              <img
+                src={collab.logo}
+                alt={collab.name}
+                class="h-7 md:h-8 w-auto filter grayscale opacity-80 group-hover:grayscale-0 group-hover:opacity-100 transition-all duration-300"
+              />
+            </a>
+          ))
+        }
+      </div>
+    </div>
+  </div>
+</footer>
diff --git a/src/layouts/components/Header/Header.astro b/src/layouts/components/Header/Header.astro
new file mode 100644
index 0000000..cad888f
--- /dev/null
+++ b/src/layouts/components/Header/Header.astro
@@ -0,0 +1,13 @@
+---
+import Navigation from './components/Navigation.astro'
+
+interface Props {
+  lang?: string
+}
+
+const { lang } = Astro.props
+---
+
+<header class="w-full z-50">
+  <Navigation lang={lang} />
+</header>
diff --git a/src/components/LanguagePicker.astro b/src/layouts/components/Header/components/LanguagePicker.astro
similarity index 98%
rename from src/components/LanguagePicker.astro
rename to src/layouts/components/Header/components/LanguagePicker.astro
index 510f27a..71f1e82 100644
--- a/src/components/LanguagePicker.astro
+++ b/src/layouts/components/Header/components/LanguagePicker.astro
@@ -1,6 +1,6 @@
 ---
 import { i18n } from 'astro:config/client'
-import { texts } from '../i18n/components/LanguagePicker'
+import { texts } from '@/i18n/components/LanguagePicker'
 
 // Idiomas disponibles
 const languages = i18n.locales as string[]
diff --git a/src/components/Navigation.astro b/src/layouts/components/Header/components/Navigation.astro
similarity index 99%
rename from src/components/Navigation.astro
rename to src/layouts/components/Header/components/Navigation.astro
index 654361e..36f7359 100644
--- a/src/components/Navigation.astro
+++ b/src/layouts/components/Header/components/Navigation.astro
@@ -1,8 +1,9 @@
 ---
 import ResponsiveToggle from './ResponsiveToggle.astro'
 import LanguagePicker from './LanguagePicker.astro'
-import { getRelativeLocaleUrl } from 'astro:i18n'
-import { menuTexts } from '../i18n/menu'
+    import { getRelativeLocaleUrl } from 'astro:i18n'
+import { menuTexts } from '@/i18n/menu'
+
 interface MenuItem {
   label: string
   href: string
diff --git a/src/components/ResponsiveToggle.astro b/src/layouts/components/Header/components/ResponsiveToggle.astro
similarity index 100%
rename from src/components/ResponsiveToggle.astro
rename to src/layouts/components/Header/components/ResponsiveToggle.astro
diff --git a/src/pages/[lang]/accommodation.astro b/src/pages/[lang]/accommodation.astro
index e340b5f..6d745ba 100644
--- a/src/pages/[lang]/accommodation.astro
+++ b/src/pages/[lang]/accommodation.astro
@@ -19,7 +19,7 @@ const title = titles[(lang || 'es') as keyof typeof titles]
 
 <Layout title={title}>
   <div
-    class="accommodation-page-wrapper min-h-screen w-full absolute top-0 left-0 z-10 overflow-x-hidden pt-24"
+    class="grow w-full pt-24"
   >
     <div class="container mx-auto px-4 md:px-8">
       <AccommodationPage lang={lang || 'es'} />
diff --git a/src/pages/[lang]/code-of-conduct.astro b/src/pages/[lang]/code-of-conduct.astro
index 971178f..060ade5 100644
--- a/src/pages/[lang]/code-of-conduct.astro
+++ b/src/pages/[lang]/code-of-conduct.astro
@@ -26,7 +26,7 @@ const {
 ---
 
 <Layout title={title} description={intro}>
-  <div class="max-w-4xl mx-auto px-4 py-8 mt-20">
+  <div class="grow container mx-auto px-4 py-8 mt-20">
     <!-- Hero -->
     <header class="text-center mb-16">
       <h1 class="text-4xl md:text-5xl font-extrabold leading-tight mb-6">
diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro
index 71ac21b..337c112 100644
--- a/src/pages/[lang]/index.astro
+++ b/src/pages/[lang]/index.astro
@@ -1,5 +1,5 @@
 ---
-import IndexPage from '../../components/index.astro'
+import IndexPage from '@/components/index.astro'
 
 export function getStaticPaths() {
   return [{ params: { lang: 'es' } }, { params: { lang: 'en' } }, { params: { lang: 'ca' } }]
diff --git a/src/pages/[lang]/location.astro b/src/pages/[lang]/location.astro
index 00ba711..f384090 100644
--- a/src/pages/[lang]/location.astro
+++ b/src/pages/[lang]/location.astro
@@ -18,17 +18,11 @@ const title = titles[(lang || 'es') as keyof typeof titles]
 ---
 
 <Layout title={title}>
-  <div class="location-page-wrapper min-h-screen w-full absolute top-0 left-0 z-10 overflow-x-hidden pt-24">
+  <div class="grow w-full pt-24">
     <div class="container mx-auto px-4 md:px-8">
       <LocationPage lang={lang || 'es'} />
     </div>
   </div>
 </Layout>
 
-<style>
-  .location-page-wrapper {
-    background:
-      radial-gradient(circle at 50% -20%, rgba(255, 130, 0, 0.05) 0%, transparent 50%),
-      radial-gradient(circle at 0% 100%, rgba(247, 37, 133, 0.05) 0%, transparent 50%);
-  }
-</style>
+
diff --git a/src/pages/[lang]/sponsors.astro b/src/pages/[lang]/sponsors.astro
index 2f79bfa..97d8384 100644
--- a/src/pages/[lang]/sponsors.astro
+++ b/src/pages/[lang]/sponsors.astro
@@ -1,7 +1,7 @@
 ---
-import Layout from '../../layouts/Layout.astro'
-import { SPONSORS_EMAIL } from '../constants'
-import { texts } from '../../i18n/sponsors'
+import Layout from '@/layouts/Layout.astro'
+import { SPONSORS_EMAIL } from '@/constants.ts'
+import { texts } from '@/i18n/sponsors'
 
 export function getStaticPaths() {
   return [{ params: { lang: 'es' } }, { params: { lang: 'en' } }, { params: { lang: 'ca' } }]
@@ -26,7 +26,6 @@ const {
   benefitDetails,
   addons,
   pythonSpainPoints,
-  socialLinks,
   tiers,
   testimonials,
   interests,
@@ -37,8 +36,8 @@ const {
 ---
 
 <Layout title={title}>
-  <div class="page-wrapper min-h-screen w-full absolute top-0 left-0 z-10 overflow-x-hidden">
-    <div class="container-custom max-w-300 mx-auto px-4 py-8 text-white">
+  <div class="grow w-full overflow-x-hidden">
+    <div class="container mx-auto px-4 py-8 text-white">
       <!-- Hero -->
       <div class="text-center mb-12">
         <img src="/images/logo-vertical-alt-color-dark.svg" alt="PyconES 2026" class="h-50 mx-auto mb-4" />
@@ -520,26 +519,6 @@ const {
           <p class="mt-6 text-white">{SPONSORS_EMAIL}</p>
         </div>
       </section>
-
-      <!-- Social links -->
-      <section class="text-center pb-16">
-        <h2 class="text-xl font-bold mb-6">{socialLinks.title}</h2>
-        <div class="flex flex-wrap justify-center gap-4">
-          {
-            socialLinks.items.map((link: { url: string; label: string; icon: string }) => (
-              <a
-                href={link.url}
-                target="_blank"
-                rel="noopener noreferrer"
-                class="flex items-center gap-2 bg-white px-4 py-2 rounded border border-white/10 hover:border-pycon-yellow transition-colors text-gray-600 hover:text-pycon-yellow"
-              >
-                <span>{link.icon}</span>
-                <span>{link.label}</span>
-              </a>
-            ))
-          }
-        </div>
-      </section>
     </div>
   </div>
 </Layout>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index aa37d48..04a1b5c 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,6 +1,6 @@
 ---
 import { i18n } from 'astro:config/client'
-import IndexPage from '../components/index.astro'
+import IndexPage from '@/components/index.astro'
 
 const locales = i18n.locales
 const defaultLocale = i18n.defaultLocale
diff --git a/src/style/global.css b/src/style/global.css
index 763b854..0f0cc2a 100644
--- a/src/style/global.css
+++ b/src/style/global.css
@@ -105,4 +105,11 @@ html {
     --bg-symbol: url('/images/symbol-black-dark.svg');
     color-scheme: dark;
   }
+
+  :root.light {
+    --bg-color: #ffffff;
+    --text-color: #1d1d1b;
+    --bg-symbol: url('/images/symbol-black-light.svg');
+    color-scheme: light;
+  }
 }
diff --git a/tsconfig.json b/tsconfig.json
index e11a86f..2e66b49 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,4 +1,10 @@
 {
   "extends": "astro/tsconfigs/base",
-  "include": ["src/**/*"]
+  "include": ["src/**/*"], 
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  }
 }