diff --git a/src/frets/Chord.svelte b/src/frets/Chord.svelte
index de3a89c..9ec2265 100644
--- a/src/frets/Chord.svelte
+++ b/src/frets/Chord.svelte
@@ -1,7 +1,7 @@
 <script>
   import { getChordVariations } from "../frets/chordFingerings.js";
   import { tunings } from "$lib";
-  import { getContext } from "svelte";
+  import { getContext, onMount } from "svelte";
   import { SVGuitarChord } from "svguitar";
 
   let {
@@ -16,11 +16,15 @@
   let el = $state(null);
   let width = $state(0);
   let height = $state(0);
+  let isDarkMode = $state(false);
 
   const variations = $derived(getChordVariations(chordName, tuning));
   // Use the first variation
   const chordData = $derived(variations.positions[position]);
 
+  // Colors based on color scheme
+  const chordColor = $derived(isDarkMode ? "#e5e7eb" : "#333");
+
   function playChord() {
     if (chordData?.midi) {
       console.log("Playing chord:", chordName, "MIDI:", chordData.midi);
@@ -32,6 +36,17 @@
     }
   }
 
+  onMount(() => {
+    const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
+    isDarkMode = mediaQuery.matches;
+
+    const handler = (e) => {
+      isDarkMode = e.matches;
+    };
+    mediaQuery.addEventListener("change", handler);
+    return () => mediaQuery.removeEventListener("change", handler);
+  });
+
   $effect(() => {
     // Redraw the chord whenever props or chordData changes
     if (!el || !chordData) return;
@@ -49,11 +64,12 @@
         position: chordData.position,
         strokeWidth: 1,
         fingerSize: 0.5,
-        fingerColor: "#333",
+        fingerColor: chordColor,
+        fingerTextColor: isDarkMode ? "#374151" : "#fff",
         fingerTextSize: 20,
         fretSize: 1.1,
-        fretColor: "#333",
-        color: "#333",
+        fretColor: chordColor,
+        color: chordColor,
         titleFontSize: 28,
         titleBottomMargin: 10,
         fretLabelFontSize: 20,
@@ -87,7 +103,7 @@
 
 <style>
   :global(.barre-rectangle) {
-    fill: #333 !important;
+    @apply fill-[#333] dark:fill-[#e5e7eb];
   }
 
   :global(.tuning) {
diff --git a/src/index.css b/src/index.css
index b905e07..708cd61 100644
--- a/src/index.css
+++ b/src/index.css
@@ -14,3 +14,12 @@
   --color-purple-900: #581c87;
   --color-purple-950: #3b0764;
 }
+
+/* Base styles for light/dark mode */
+html {
+  @apply bg-white text-gray-900 dark:bg-gray-900 dark:text-gray-100;
+}
+
+select {
+  @apply w-fit border border-gray-200 rounded-sm dark:border-blue-700/50 dark:bg-blue-900/50 dark:text-blue-50 dark:hover:bg-blue-800 dark:hover:border-blue-700;
+}
diff --git a/src/lib/FretBoard.svelte b/src/lib/FretBoard.svelte
index 36d97a2..50fb37a 100644
--- a/src/lib/FretBoard.svelte
+++ b/src/lib/FretBoard.svelte
@@ -52,7 +52,7 @@
           <line
             x1={fretX(1) - margin.left}
             x2={width - margin.right - margin.left}
-            class="stroke-gray-100"
+            class="stroke-gray-100 dark:stroke-blue-950"
             stroke-width={lineW(i)} />
           {#each notes as stringNote}
             <g
@@ -99,12 +99,12 @@
   @reference "tailwindcss";
 
   .fret-label {
-    @apply text-xs fill-gray-800 text-center -translate-y-2;
+    @apply text-xs fill-gray-800 text-center -translate-y-2 dark:fill-blue-500;
     text-anchor: middle;
     dominant-baseline: ideographic;
   }
 
   .fret-line {
-    @apply fill-gray-400 stroke-0;
+    @apply fill-gray-400 stroke-0 dark:fill-blue-950;
   }
 </style>
diff --git a/src/lib/FretNote.svelte b/src/lib/FretNote.svelte
index a475e1d..7c47d56 100644
--- a/src/lib/FretNote.svelte
+++ b/src/lib/FretNote.svelte
@@ -26,11 +26,11 @@
   @reference "tailwindcss";
 
   .fret-note-background {
-    @apply fill-white;
+    @apply fill-transparent;
   }
 
   .fret-note-text {
-    @apply text-xs fill-gray-500;
+    @apply text-xs fill-gray-500 dark:fill-blue-500;
   }
 
   .fret-note:not(.in-position):is(.in-scale) .fret-note-background {
@@ -38,11 +38,11 @@
   }
 
   .fret-note:not(.in-position):is(.in-scale) .fret-note-text {
-    @apply font-normal fill-gray-500;
+    @apply font-normal fill-gray-500 dark:fill-blue-500;
   }
 
   .in-scale .fret-note-background {
-    @apply fill-sky-600 stroke-1 stroke-sky-800;
+    @apply fill-sky-600 stroke-0 stroke-sky-800 dark:fill-blue-900 dark:stroke-sky-800;
   }
 
   .in-scale .fret-note-text {
@@ -50,10 +50,14 @@
   }
 
   .in-scale[data-interval="1P"] circle {
-    @apply fill-gray-800 stroke-gray-900 stroke-2;
+    @apply fill-gray-800 stroke-1 stroke-gray-900 dark:fill-blue-600 dark:stroke-blue-300;
+  }
+
+  .in-scale[data-interval="1P"] .fret-note-text {
+    @apply dark:fill-blue-100;
   }
 
   .in-scale:is([data-interval^="3"], [data-interval^="5"]) circle {
-    @apply fill-sky-800;
+    @apply fill-blue-700 stroke-1 stroke-blue-600;
   }
 </style>
diff --git a/src/lib/KeySelector.svelte b/src/lib/KeySelector.svelte
index 19a2692..b80af03 100644
--- a/src/lib/KeySelector.svelte
+++ b/src/lib/KeySelector.svelte
@@ -3,7 +3,7 @@
   let notes = ["C", "C#", "D", "Eb", "E", "F", "F#", "G", "Ab", "A", "Bb", "B"];
 </script>
 
-<select bind:value class="border-gray-300 w-fit">
+<select bind:value>
   {#each notes as note}
     <option value={note}>
       {note}
diff --git a/src/lib/ScaleChords.svelte b/src/lib/ScaleChords.svelte
index 972c051..73169ae 100644
--- a/src/lib/ScaleChords.svelte
+++ b/src/lib/ScaleChords.svelte
@@ -21,9 +21,11 @@
   });
 </script>
 
-<div class="text-xs text-gray-500 grid grid-cols-4 md:grid-cols-7 gap-5">
+<div
+  class="text-xs text-gray-500 grid grid-cols-4 md:grid-cols-7 gap-5 dark:text-gray-400">
   {#each chords as chord}
-    <div class="bg-gray-100 py-5">
+    <div
+      class="bg-gray-100 py-5 transition-all dark:bg-blue-900/20 dark:border dark:border-blue-900/50 dark:hover:bg-blue-900/40 rounded">
       <Chord chordName={chord} />
     </div>
   {/each}
diff --git a/src/lib/ScaleInfo.svelte b/src/lib/ScaleInfo.svelte
index 374f591..38962f8 100644
--- a/src/lib/ScaleInfo.svelte
+++ b/src/lib/ScaleInfo.svelte
@@ -43,7 +43,7 @@
           text-anchor="middle"
           dy="25"
           font-size="10"
-          class="text-black"
+          class="text-black dark:text-gray-200"
           fill="currentColor">{note.interval}</text>
       </g>
     {/each}
diff --git a/src/lib/ScaleSelector.svelte b/src/lib/ScaleSelector.svelte
index 510738a..3d7fd8b 100644
--- a/src/lib/ScaleSelector.svelte
+++ b/src/lib/ScaleSelector.svelte
@@ -17,7 +17,7 @@
   ];
 </script>
 
-<select bind:value class="border-gray-300 w-fit">
+<select bind:value>
   {#each scales as scale}
     <option value={scale}>
       {scale}
diff --git a/src/lib/SystemSelector.svelte b/src/lib/SystemSelector.svelte
index 68a5d4c..05d3b23 100644
--- a/src/lib/SystemSelector.svelte
+++ b/src/lib/SystemSelector.svelte
@@ -12,7 +12,7 @@
 
 <div class="flex gap-5">
   <div>
-    <select bind:value={system} class="w-fit border border-gray-200">
+    <select bind:value={system}>
       <option value="CAGED">CAGED</option>
       <option value="Pentatonic">Pentatonic</option>
     </select>
@@ -47,7 +47,7 @@
   @reference "tailwindcss";
 
   input[type="radio"] {
-    @apply border-gray-400 checked:bg-sky-600 checked:border-sky-600 active:bg-sky-200 focus:ring-1 focus:ring-sky-500;
+    @apply border-gray-400 checked:bg-sky-600 checked:border-sky-600 active:bg-sky-200 focus:ring-1 focus:ring-sky-500 dark:bg-blue-900 dark:border-blue-500 dark:active:bg-blue-700 dark:checked:bg-blue-400 dark:checked:border-blue-200;
   }
 
   label {
diff --git a/src/lib/TuningSelector.svelte b/src/lib/TuningSelector.svelte
index 909cabb..0c9f7d6 100644
--- a/src/lib/TuningSelector.svelte
+++ b/src/lib/TuningSelector.svelte
@@ -4,7 +4,7 @@
   let { value = $bindable() } = $props();
 </script>
 
-<select bind:value name="tuning" class="w-full border border-gray-200">
+<select bind:value name="tuning">
   {#each tunings as [name]}
     <option value={name}>{name}</option>
   {/each}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index d51016e..278aa69 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -104,7 +104,7 @@
 </svelte:head>
 
 <div
-  class="flex bg-gray-50 *:p-5 *:border-r *:border-gray-200 border-b border-gray-300">
+  class="flex bg-gray-50 *:p-5 *:border-r *:border-gray-200 border-b border-gray-300 dark:bg-blue-950 dark:*:border-blue-900 dark:border-blue-900">
   <div>
     <TuningSelector bind:value={tuning} />
   </div>
@@ -127,7 +127,7 @@
 </div>
 
 {#if triads.length > 0}
-  <div class="relative bg-gray-50 border-t border-gray-200 p-5">
+  <div class="relative bg-gray-50 p-5 dark:bg-transparent dark:border-blue-900">
     <ScaleChords scale={scaleObj} />
   </div>
 {/if}