diff --git a/src/App.svelte b/src/App.svelte
index e5502ca..5ff180b 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,8 +1,7 @@
 <script>
   import { onMount } from 'svelte';
-  import LogoGrid from './components/Grid.svelte';
-  import LogoList from './components/List.svelte';
-  import Header from './components/Header.svelte';
+  import LogoGrid from './components/LogoGrid.svelte';
+  import LogoList from './components/LogoList.svelte';
 
   let viewMode = 'grid'; // 'grid' or 'list'
   let searchQuery = '';
diff --git a/src/components/Grid.svelte b/src/components/Grid.svelte
deleted file mode 100644
index a375563..0000000
--- a/src/components/Grid.svelte
+++ /dev/null
@@ -1,35 +0,0 @@
-<script>
-  import Preview from './Preview.svelte';
-  import Actions from './Actions.svelte';
-  import Row from './Row.svelte';
-  import { onMount, onDestroy } from 'svelte';
-
-  export let logos = [];
-  export let onCopy;
-  export let onDownload;
-
-  let showModal = false;
-  let selectedLogo = null;
-
-  export let theme;
-</script>
-
-<Preview show={showModal} logo={selectedLogo} theme={theme} on:close={() => showModal = false} />
-
-<div class="logo-grid">
-  {#each logos as logo}
-    <Row {logo} view="grid" showActions={true} onPreview={() => { selectedLogo = logo; showModal = true; }}>
-      <svelte:fragment slot="actions">
-        <Actions {logo} {onCopy} {onDownload} />
-      </svelte:fragment>
-    </Row>
-  {/each}
-</div>
-
-<style>
-  .logo-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
-    gap: 1.5rem;
-  }
-</style>
diff --git a/src/components/List.svelte b/src/components/List.svelte
deleted file mode 100644
index c19265d..0000000
--- a/src/components/List.svelte
+++ /dev/null
@@ -1,35 +0,0 @@
-<script>
-  import Preview from './Preview.svelte';
-  import Actions from './Actions.svelte';
-  import Row from './Row.svelte';
-  import { onMount, onDestroy } from 'svelte';
-
-  export let logos = [];
-  export let onCopy;
-  export let onDownload;
-
-  let showModal = false;
-  let selectedLogo = null;
-
-  export let theme;
-</script>
-
-<Preview show={showModal} logo={selectedLogo} theme={theme} on:close={() => showModal = false} />
-
-<div class="logo-list">
-  {#each logos as logo}
-    <Row {logo} view="list" showActions={true} onPreview={() => { selectedLogo = logo; showModal = true; }}>
-      <svelte:fragment slot="actions">
-        <Actions {logo} {onCopy} {onDownload} />
-      </svelte:fragment>
-    </Row>
-  {/each}
-</div>
-
-<style>
-  .logo-list {
-    display: flex;
-    flex-direction: column;
-    gap: 0.5em;
-  }
-</style>
diff --git a/src/components/Actions.svelte b/src/components/LogoActions.svelte
similarity index 99%
rename from src/components/Actions.svelte
rename to src/components/LogoActions.svelte
index 3f6ea0a..0c16e06 100644
--- a/src/components/Actions.svelte
+++ b/src/components/LogoActions.svelte
@@ -1,5 +1,6 @@
 <script>
   export let logo;
+  export let onCopy;
   export let onDownload;
 
   // Download menu state
diff --git a/src/components/LogoGrid.svelte b/src/components/LogoGrid.svelte
new file mode 100644
index 0000000..88050d8
--- /dev/null
+++ b/src/components/LogoGrid.svelte
@@ -0,0 +1,196 @@
+<script>
+  import LogoModal from './LogoModal.svelte';
+  import LogoActions from './LogoActions.svelte';
+  import InlineSvg from './InlineSvg.svelte';
+  import { onMount, onDestroy } from 'svelte';
+  import { getDefaultLogoColor, getThemeColor } from '../utils/colorTheme.js';
+
+  export let logos = [];
+  export let onCopy;
+  export let onDownload;
+
+  let showModal = false;
+  let selectedLogo = null;
+
+  function openPreview(logo) {
+    selectedLogo = logo;
+    showModal = true;
+  }
+
+  function closeModal() {
+    showModal = false;
+  }
+
+  function isSvgLogo(logo) {
+    return logo.format && logo.format.toLowerCase() === 'svg';
+  }
+
+  export let theme;
+$: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
+
+  // Improved debug logging for color and theme for each logo
+  $: {
+    if (logos && logos.length) {
+      logos.forEach(logo => {
+        if (logo.colors) {
+          const themeColor = getDefaultLogoColor(logo.colors, theme);
+          const fallbackColor = getThemeColor(logo.colors, theme);
+          const activeColor = logo._activeColor || themeColor;
+        }
+      });
+    }
+  }
+
+  // Inline SVG logic for color switching
+  let svgCache = {};
+
+  async function fetchInlineSvg(path) {
+    if (svgCache[path]) return svgCache[path];
+    const res = await fetch(path);
+    const text = await res.text();
+    svgCache[path] = text;
+    return text;
+  }
+</script>
+
+<LogoModal show={showModal} logo={selectedLogo} theme={theme} on:close={closeModal} />
+
+<div class="logo-grid">
+  {#each logos as logo}
+    <div class="logo-card">
+      <div class="logo-image"
+        role="button"
+        tabindex="0"
+        aria-label="Preview {logo.name}"
+        on:click={() => openPreview(logo)}
+        on:keydown={(e) => (e.key === 'Enter' || e.key === ' ') && openPreview(logo)}
+        style="cursor:pointer;"
+      >
+        {#if isSvgLogo(logo)}
+          {#key theme + (logo._activeColor || '')}
+            <InlineSvg
+              path={logo.path}
+              color={logo.colors ? (logo._activeColor || getLogoThemeColor(logo)) : undefined}
+              colorConfig={logo.colors ? logo.colorConfig : undefined}
+              alt={logo.name}
+            />
+          {/key}
+        {:else}
+          <img src={logo.path} alt={logo.name} />
+        {/if}
+      </div>
+      <div class="logo-info">
+        <h3>{logo.name}</h3>
+        <div class="format-row">
+          <span><strong>Format:</strong> {logo.format}</span>
+          {#if logo.colors}
+            <div class="color-switcher-preview align-right">
+              <span
+                class="color-circle color-reset"
+                title="Reset to theme color"
+                tabindex="0"
+                role="button"
+                aria-label="Reset to theme color"
+                style="background: none; width: 24px; height: 24px; display: inline-flex; align-items: center; justify-content: center; padding: 0; margin: 0; border: none;"
+                on:click|stopPropagation={() => logo._activeColor = undefined}
+                on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && (logo._activeColor = undefined)}
+              >
+                <svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+                  <circle cx="400" cy="400" r="400" style="fill:#d6d6d6;"/>
+                  <path d="M682.843,117.843l-565.686,565.685c-156.209,-156.21 -156.209,-409.476 0,-565.685c156.21,-156.21 409.476,-156.21 565.686,-0Z" style="fill:#33363f;"/>
+                </svg>
+              </span>
+              {#each logo.colors as colorObj}
+                <span
+                  class="color-circle"
+                  title={colorObj.label}
+                  style="background:{colorObj.value}"
+                  tabindex="0"
+                  role="button"
+                  on:click|stopPropagation={() => logo._activeColor = colorObj.value}
+                  on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && (logo._activeColor = colorObj.value)}
+                ></span>
+              {/each}
+            </div>
+          {/if}
+        </div>
+        <div class="logo-actions">
+          <LogoActions {logo} {onCopy} {onDownload} />
+        </div>
+      </div>
+    </div>
+  {:else}
+    <p class="no-results">No logos found matching your search criteria.</p>
+  {/each}
+</div>
+
+<style>
+  :global(.logo-card) {
+    background: var(--color-card);
+    color: var(--color-text);
+    border: 1px solid var(--color-border);
+    border-radius: 8px;
+    /* overflow: hidden; removed to allow dropdown menus to escape the card */
+    transition: background 0.2s, color 0.2s, transform 0.2s, box-shadow 0.2s;
+    min-width: 320px;
+  }
+  .logo-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
+    gap: 1.5rem;
+  }
+  .logo-image {
+    height: 260px;
+    width: 100%;
+    padding: 1rem;
+    position: relative;
+  }
+  .logo-info {
+    padding: 1rem;
+    background: var(--color-card);
+    color: var(--color-text);
+    border-top: 1px solid var(--color-border);
+    transition: background 0.2s, color 0.2s;
+  }
+  .logo-info h3 {
+    margin-bottom: 0.5rem;
+    color: var(--color-accent, #4f8cff);
+  }
+  .no-results {
+    grid-column: 1 / -1;
+    text-align: center;
+    padding: 2rem;
+    color: #666;
+  }
+  .color-circle.color-reset {
+    background: none !important;
+    width: 24px;
+    height: 24px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0;
+    margin: 0;
+    border: none;
+  }
+  .color-circle.color-reset svg {
+    pointer-events: none;
+  }
+  .color-circle {
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 4px;
+    cursor: pointer;
+    box-sizing: border-box;
+    padding: 0;
+  }
+  .color-switcher-preview.align-right {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+</style>
diff --git a/src/components/LogoList.svelte b/src/components/LogoList.svelte
new file mode 100644
index 0000000..22fc4d7
--- /dev/null
+++ b/src/components/LogoList.svelte
@@ -0,0 +1,187 @@
+<script>
+  import LogoModal from './LogoModal.svelte';
+  import LogoActions from './LogoActions.svelte';
+  import InlineSvg from './InlineSvg.svelte';
+  import { getThemeColor, getDefaultLogoColor } from '../utils/colorTheme.js';
+  import { onMount, onDestroy } from 'svelte';
+
+  export let logos = [];
+  export let onCopy;
+  export let onDownload;
+
+  let showModal = false;
+  let selectedLogo = null;
+
+  let theme = getTheme();
+
+  function openPreview(logo) {
+    selectedLogo = logo;
+    showModal = true;
+  }
+
+  function closeModal() {
+    showModal = false;
+  }
+
+  function isSvgLogo(logo) {
+    return logo.format && logo.format.toLowerCase() === 'svg';
+  }
+
+  function getTheme() {
+    if (typeof window !== 'undefined' && window.matchMedia) {
+      return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+    }
+    return 'light';
+  }
+
+  function handleThemeChange(e) {
+    theme = e.matches ? 'dark' : 'light';
+  }
+
+  onMount(() => {
+    const mql = window.matchMedia('(prefers-color-scheme: dark)');
+    mql.addEventListener('change', handleThemeChange);
+  });
+
+  onDestroy(() => {
+    const mql = window.matchMedia('(prefers-color-scheme: dark)');
+    mql.removeEventListener('change', handleThemeChange);
+  });
+
+  $: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
+
+  // Debug logging for color and theme
+  $: {
+    if (logos && logos.length) {
+      logos.forEach(logo => {
+        if (logo.colors) {
+          const themeColor = getDefaultLogoColor(logo.colors, theme);
+          const activeColor = logo._activeColor || themeColor;
+          console.log('[LogoList] Logo:', logo.name, '| Theme:', theme, '| Theme color:', themeColor, '| Active color:', activeColor);
+        }
+      });
+    }
+  }
+</script>
+
+<LogoModal show={showModal} logo={selectedLogo} on:close={closeModal} />
+
+<div class="logo-list">
+  {#each logos as logo}
+    <div class="logo-item">
+      <div class="logo-preview"
+        role="button"
+        tabindex="0"
+        aria-label="Preview {logo.name}"
+        on:click={() => openPreview(logo)}
+        on:keydown={(e) => (e.key === 'Enter' || e.key === ' ') && openPreview(logo)}
+        style="cursor:pointer;"
+      >
+        {#if isSvgLogo(logo)}
+          <InlineSvg
+            path={logo.path}
+            color={logo.colors ? (logo._activeColor || getLogoThemeColor(logo)) : undefined}
+            colorConfig={logo.colors ? logo.colorConfig : undefined}
+            alt={logo.name}
+          />
+        {:else}
+          <img src={logo.path} alt={logo.name} />
+        {/if}
+      </div>
+      <div class="logo-info">
+        <h3>{logo.name}</h3>
+        <div class="format-row">
+          <span><strong>Format:</strong> {logo.format}</span>
+        </div>
+        {#if logo.colors}
+          <div class="color-switcher-preview align-left">
+            <span
+              class="color-circle color-reset"
+              title="Reset to theme color"
+              tabindex="0"
+              role="button"
+              aria-label="Reset to theme color"
+              style="background: none; width: 24px; height: 24px; display: inline-flex; align-items: center; justify-content: center; padding: 0; margin: 0; border: none;"
+              on:click|stopPropagation={() => logo._activeColor = undefined}
+              on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && (logo._activeColor = undefined)}
+            >
+              <svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+                <circle cx="400" cy="400" r="400" style="fill:#d6d6d6;"/>
+                <path d="M682.843,117.843l-565.686,565.685c-156.209,-156.21 -156.209,-409.476 0,-565.685c156.21,-156.21 409.476,-156.21 565.686,-0Z" style="fill:#33363f;"/>
+              </svg>
+            </span>
+            {#each logo.colors as colorObj}
+              <span
+                class="color-circle"
+                title={colorObj.label}
+                style={`background:${colorObj.value}`}
+                tabindex="0"
+                role="button"
+                on:click|stopPropagation={() => logo._activeColor = colorObj.value}
+                on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && (logo._activeColor = colorObj.value)}
+              ></span>
+            {/each}
+          </div>
+        {/if}
+      </div>
+      <div class="logo-actions">
+        <LogoActions {logo} {onCopy} {onDownload} />
+      </div>
+    </div>
+  {:else}
+    <p class="no-results">No logos found matching your search criteria.</p>
+  {/each}
+</div>
+
+<style>
+  :global(.logo-item) {
+    background: var(--color-card);
+    color: var(--color-text);
+    border: 1px solid var(--color-border);
+    border-radius: 8px;
+    display: grid;
+    grid-template-columns: 80px 2fr 3fr 150px;
+    align-items: center;
+    gap: 1rem;
+    padding: 1rem;
+    transition: background 0.2s, color 0.2s;
+  }
+  .logo-preview {
+    height: 100px;
+    width: 80px;
+    padding: 0;
+    border-radius: 4px;
+    position: relative;
+  }
+  .logo-info h3 {
+    margin-bottom: 0.5rem;
+    color: var(--color-accent, #4f8cff);
+  }
+  .logo-list {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+  }
+  .no-results {
+    text-align: center;
+    padding: 2rem;
+    color: #666;
+  }
+  .color-circle {
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 4px;
+    cursor: pointer;
+    box-sizing: border-box;
+  }
+  .color-switcher-preview.align-left {
+    justify-content: flex-start;
+  }
+  .color-circle.color-reset {
+    background: none !important;
+  }
+</style>
diff --git a/src/components/Preview.svelte b/src/components/LogoModal.svelte
similarity index 82%
rename from src/components/Preview.svelte
rename to src/components/LogoModal.svelte
index 48eb564..3108cd3 100644
--- a/src/components/Preview.svelte
+++ b/src/components/LogoModal.svelte
@@ -1,8 +1,12 @@
 <script>
   import { onMount, onDestroy, createEventDispatcher } from 'svelte';
   import InlineSvg from './InlineSvg.svelte';
+<<<<<<< HEAD:src/components/Preview.svelte
   import { getDefaultLogoColor } from '../utils/colorTheme.js';
   import { loadTagsData, getTagObj } from '../utils/tagUtils.js';
+=======
+  import { getDefaultLogoColor, getThemeColor } from '../utils/colorTheme.js';
+>>>>>>> parent of aaf7db1 (feat: Refactor logo components into Grid and List views):src/components/LogoModal.svelte
 
   export let show = false;
   export let logo = null;
@@ -24,6 +28,7 @@
     return logo && logo.format && logo.format.toLowerCase() === 'svg';
   }
 
+<<<<<<< HEAD:src/components/Preview.svelte
   function getLogoThemeColor(logo) {
     return logo && logo.colors ? getDefaultLogoColor(logo.colors, theme) : undefined;
   }
@@ -31,6 +36,23 @@
   onMount(async () => {
     document.addEventListener('keydown', handleKeydown);
     await loadTagsData();
+=======
+  // Always use $theme directly, do not cache in a function
+  export let theme;
+$: getLogoThemeColor = logo => getDefaultLogoColor(logo.colors, theme);
+
+  // Improved debug logging for color and theme
+  $: {
+    if (logo && logo.colors) {
+      const themeColor = getDefaultLogoColor(logo.colors, theme);
+      const fallbackColor = getThemeColor(logo.colors, theme);
+      const activeColor = logo._activeColor || themeColor;
+    }
+  }
+
+  onMount(() => {
+    document.addEventListener('keydown', handleKeydown);
+>>>>>>> parent of aaf7db1 (feat: Refactor logo components into Grid and List views):src/components/LogoModal.svelte
   });
 
   onDestroy(() => {
@@ -94,12 +116,17 @@
           <p><strong>Path:</strong> {logo.path}</p>
           {#if logo.tags && logo.tags.length}
             <div class="logo-tags">
+<<<<<<< HEAD:src/components/Preview.svelte
               {#each logo.tags as tag}
                 {#if getTagObj(tag).color}
                   <span class="logo-tag" style={`background:${getTagObj(tag).color}`}>{tag}</span>
                 {:else}
                   <span class="logo-tag">{tag}</span>
                 {/if}
+=======
+              {#each logo.tags as tagObj}
+                <span class="logo-tag" style={tagObj.color ? `background:${tagObj.color}` : ''}>{tagObj.text || tagObj}</span>
+>>>>>>> parent of aaf7db1 (feat: Refactor logo components into Grid and List views):src/components/LogoModal.svelte
               {/each}
             </div>
           {/if}