diff --git a/src/components/SlugInput.astro b/src/components/SlugInput.astro
index f680986..94db311 100644
--- a/src/components/SlugInput.astro
+++ b/src/components/SlugInput.astro
@@ -6,74 +6,78 @@ interface Props {
 const { currentSlugs = [] } = Astro.props;
 
 import { availableLanguages, languageMap } from '../lib/api';
+
+const languages = [
+  { value: 'en', label: 'English' },
+  { value: 'ja', label: 'Japanese' },
+  { value: 'ko', label: 'Korean' },
+  { value: 'zh', label: 'Chinese' },
+  { value: 'fr', label: 'French' },
+  { value: 'es', label: 'Spanish' },
+  { value: 'it', label: 'Italian' },
+  { value: 'de', label: 'German' },
+  { value: 'tr', label: 'Turkish' },
+  { value: 'pl', label: 'Polish' },
+];
 ---
 
-<div class="space-y-4">
-  <div class="flex flex-col space-y-2">
-    <label for="slug-input" class="text-sm font-medium text-primary">
-      Add Comic Slug
-      <span class="text-primary/60">(e.g., "01-one-piece" from https://comick.io/comic/01-one-piece)</span>
-    </label>
+<div class="space-y-6">
+  <div class="flex flex-col gap-4">
     <div class="flex gap-2">
-      <input
-        type="text"
-        id="slug-input"
-        placeholder="Enter comic slug..."
-        class="flex-1 px-4 py-2 rounded-md bg-secondary text-primary border border-hover focus:border-accent focus:outline-none focus:ring-1 focus:ring-accent transition-colors"
-      />
-      <button
-        id="add-slug"
-        class="px-4 py-2 bg-accent text-secondary hover:bg-accent-light rounded-md transition-colors font-medium"
+      <div class="flex-1">
+        <input
+          type="text"
+          id="search-input"
+          placeholder="Search for comics..."
+          class="w-full px-4 py-2 bg-primary rounded-lg border border-hover/30 focus:outline-none focus:border-accent/50 transition-colors"
+        />
+      </div>
+      <select
+        id="lang-select"
+        class="px-4 py-2 bg-primary rounded-lg border border-hover/30 focus:outline-none focus:border-accent/50 transition-colors"
       >
-        Add
-      </button>
+        {languages.map(lang => (
+          <option value={lang.value}>{lang.label}</option>
+        ))}
+      </select>
     </div>
-  </div>
 
-  <div class="flex flex-col space-y-2">
-    <label for="lang-select" class="text-sm font-medium text-primary">
-      Select Language
-    </label>
-    <select
-      id="lang-select"
-      class="px-4 py-2 rounded-md bg-secondary text-primary border border-hover focus:border-accent focus:outline-none focus:ring-1 focus:ring-accent transition-colors"
-    >
-      {availableLanguages.map(lang => (
-        <option value={lang}>
-          {languageMap[lang as keyof typeof languageMap]}
-        </option>
-      ))}
-    </select>
+    <div id="search-results" class="hidden space-y-2">
+      <!-- Search results will be populated here -->
+    </div>
   </div>
 
   <div id="slug-list" class="space-y-2">
     {currentSlugs.map(slug => (
-      <div class="flex items-center justify-between px-4 py-2 bg-secondary rounded-md group" data-slug={slug}>
+      <div class="flex items-center justify-between p-3 bg-primary rounded-lg border border-hover/30" data-slug={slug}>
         <span class="text-primary">{slug}</span>
         <button 
-          class="text-red-500 opacity-0 group-hover:opacity-100 transition-opacity"
+          class="text-red-500 hover:text-red-600 transition-colors"
           data-remove={slug}
         >
-          Remove
+          <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M6 18L18 6M6 6l12 12"></path>
+          </svg>
         </button>
       </div>
     ))}
   </div>
 
-  <div class="pt-4">
+  <div class="flex justify-center">
     <a
       id="generate-rss"
-      href="#"
-      class="inline-flex items-center gap-2 px-4 py-2 bg-accent text-secondary hover:bg-accent-light rounded-md transition-colors font-medium"
+      href="/rss/custom/"
+      class="inline-flex items-center gap-2 px-6 py-3 bg-[rgb(var(--accent-bg))] text-[rgb(var(--accent-text))] rounded-lg hover:bg-[rgb(var(--accent-light))] transition-colors"
+      onclick="return !!this.href.includes(',')"
     >
-      <svg 
-        xmlns="http://www.w3.org/2000/svg" 
-        class="w-5 h-5" 
-        viewBox="0 0 24 24" 
-        fill="none" 
-        stroke="currentColor" 
-        stroke-width="2" 
-        stroke-linecap="round" 
+      <svg
+        class="w-5 h-5"
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 24 24"
+        fill="none"
+        stroke="currentColor"
+        stroke-width="2"
+        stroke-linecap="round"
         stroke-linejoin="round"
       >
         <path d="M4 11a9 9 0 0 1 9 9"></path>
@@ -86,8 +90,8 @@ import { availableLanguages, languageMap } from '../lib/api';
 </div>
 
 <script>
-  const slugInput = document.getElementById('slug-input') as HTMLInputElement;
-  const addButton = document.getElementById('add-slug');
+  const searchInput = document.getElementById('search-input') as HTMLInputElement;
+  const searchResults = document.getElementById('search-results');
   const slugList = document.getElementById('slug-list');
   const generateRSSLink = document.getElementById('generate-rss');
   const langSelect = document.getElementById('lang-select') as HTMLSelectElement;
@@ -98,84 +102,138 @@ import { availableLanguages, languageMap } from '../lib/api';
   function updateSlugs() {
     localStorage.setItem('comic-slugs', JSON.stringify([...slugs]));
     updateRSSLink();
+    renderSlugs();
   }
 
-  function updateRSSLink() {
-    const slugString = [...slugs].join(',');
-    const lang = langSelect?.value || 'en';
-    
-    // Call the API to get a short feed ID
-    fetch('/api/create-feed', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        slugs: [...slugs],
-        lang
-      })
-    })
-    .then(response => response.json())
-    .then(data => {
-      generateRSSLink!.setAttribute('href', `/rss/${data.feedId}.xml`);
-    })
-    .catch(error => {
-      console.error('Error generating short URL:', error);
-    });
-  }
-
-  function renderSlugList() {
+  function renderSlugs() {
     if (!slugList) return;
     
     slugList.innerHTML = '';
     [...slugs].forEach(slug => {
       const div = document.createElement('div');
-      div.className = 'flex items-center justify-between px-4 py-2 bg-secondary rounded-md group';
-      div.dataset.slug = slug;
-      div.innerHTML = `
-        <span class="text-primary">${slug}</span>
-        <button 
-          class="text-red-500 opacity-0 group-hover:opacity-100 transition-opacity"
-          data-remove="${slug}"
-        >
-          Remove
-        </button>
+      div.className = 'flex items-center justify-between p-3 bg-primary rounded-lg border border-hover/30';
+      
+      const text = document.createElement('span');
+      text.textContent = slug;
+      
+      const removeBtn = document.createElement('button');
+      removeBtn.className = 'text-red-500 hover:text-red-600 transition-colors';
+      removeBtn.innerHTML = `
+        <svg class="w-5 h-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+          <path d="M6 18L18 6M6 6l12 12"></path>
+        </svg>
       `;
+      removeBtn.onclick = () => {
+        slugs.delete(slug);
+        updateSlugs();
+      };
+      
+      div.appendChild(text);
+      div.appendChild(removeBtn);
       slugList.appendChild(div);
     });
   }
 
-  function addSlug(slug: string) {
-    const sanitizedSlug = slug.trim().toLowerCase();
-    if (sanitizedSlug && !slugs.has(sanitizedSlug)) {
-      slugs.add(sanitizedSlug);
-      updateSlugs();
-      renderSlugList();
+  let searchTimeout: NodeJS.Timeout;
+  searchInput?.addEventListener('input', () => {
+    clearTimeout(searchTimeout);
+    searchTimeout = setTimeout(async () => {
+      const query = searchInput.value.trim();
+      if (query.length < 2) {
+        searchResults!.classList.add('hidden');
+        return;
+      }
+
+      try {
+        const response = await fetch(`https://api.comick.io/v1.0/search/?page=1&limit=5&q=${encodeURIComponent(query)}`);
+        const data = await response.json();
+        
+        searchResults!.innerHTML = '';
+        searchResults!.classList.remove('hidden');
+        
+        data.forEach((comic: any) => {
+          const div = document.createElement('div');
+          div.className = 'flex items-center gap-3 p-3 bg-primary rounded-lg border border-hover/30 cursor-pointer hover:border-accent/50 transition-colors';
+          div.onclick = () => {
+            slugs.add(comic.slug);
+            updateSlugs();
+            searchInput.value = '';
+            searchResults!.classList.add('hidden');
+          };
+          
+          if (comic.md_covers && comic.md_covers[0]) {
+            const img = document.createElement('img');
+            img.src = `https://meo.comick.pictures/${comic.md_covers[0].b2key}`;
+            img.className = 'w-12 h-16 object-cover rounded';
+            img.alt = comic.title;
+            div.appendChild(img);
+          }
+          
+          const info = document.createElement('div');
+          info.innerHTML = `
+            <div class="font-medium">${comic.title}</div>
+            <div class="text-sm text-primary/60">${comic.slug}</div>
+          `;
+          div.appendChild(info);
+          
+          searchResults!.appendChild(div);
+        });
+      } catch (error) {
+        console.error('Failed to search comics:', error);
+        searchResults!.innerHTML = `
+          <div class="p-3 bg-primary rounded-lg border border-red-500/30 text-red-500">
+            Failed to search comics. Please try again.
+          </div>
+        `;
+      }
+    }, 300);
+  });
+
+  async function updateRSSLink() {
+    const slugString = [...slugs].join(',');
+    const lang = langSelect?.value || 'en';
+    
+    if (slugString) {
+      try {
+        const response = await fetch('/api/create-feed', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+            slugs: [...slugs],
+            lang
+          })
+        });
+        
+        if (!response.ok) throw new Error('Failed to create feed');
+        
+        const { feedId } = await response.json();
+        generateRSSLink!.href = `/rss/${feedId}.xml`;
+        generateRSSLink!.onclick = null;
+      } catch (error) {
+        console.error('Failed to generate feed:', error);
+      }
+    } else {
+      generateRSSLink!.href = '#';
+      generateRSSLink!.onclick = (e) => {
+        e.preventDefault();
+        return false;
+      };
     }
-    slugInput.value = '';
   }
 
-  addButton?.addEventListener('click', () => addSlug(slugInput.value));
-  
-  slugInput?.addEventListener('keypress', (e) => {
-    if (e.key === 'Enter') {
-      addSlug(slugInput.value);
-    }
-  });
-
-  slugList?.addEventListener('click', (e) => {
-    const target = e.target as HTMLElement;
-    const slug = target.dataset.remove;
-    if (slug) {
-      slugs.delete(slug);
-      updateSlugs();
-      renderSlugList();
-    }
-  });
-
-  langSelect?.addEventListener('change', updateRSSLink);
-
-  // Initialize RSS link and render initial list
+  // Initial render
+  renderSlugs();
   updateRSSLink();
-  renderSlugList();
+
+  // Update RSS link when language changes
+  langSelect?.addEventListener('change', () => updateRSSLink());
+
+  // Close search results when clicking outside
+  document.addEventListener('click', (e) => {
+    if (!searchResults?.contains(e.target as Node) && !searchInput?.contains(e.target as Node)) {
+      searchResults?.classList.add('hidden');
+    }
+  });
 </script> 
\ No newline at end of file
diff --git a/src/lib/api.ts b/src/lib/api.ts
index 131f8ec..d566cbe 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -11,7 +11,8 @@ const languageMap = {
   "zh": "Chinese",
   "sv": "Swedish",
   "ar": "Arabic",
-  "de": "German"
+  "de": "German",
+  "ko": "Korean"
 } as const;
 
 const languages = new Set(Object.keys(languageMap));
diff --git a/src/pages/custom.astro b/src/pages/custom.astro
index a893396..87f97a8 100644
--- a/src/pages/custom.astro
+++ b/src/pages/custom.astro
@@ -15,8 +15,8 @@ const description = "Create a custom RSS feed for your favorite comics";
     </div>
 
     <div class="mt-8 text-center text-primary/60">
-      <p>Add the comic slugs from the URLs of your favorite comics on ComicK.</p>
-      <p> Example: For <a href="https://comick.io/comic/01-one-piece">https://comick.io/comic/01-one-piece</a>, the slug is "01-one-piece"</p>
+      <p>Search for your favorite comics using the search box above, or add their slugs manually.</p>
+      <p class="mt-2">Manual example: For <a href="https://comick.io/comic/01-one-piece" class="text-accent hover:underline">https://comick.io/comic/01-one-piece</a>, the slug is "01-one-piece"</p>
     </div>
   </main>
 </Layout> 
\ No newline at end of file