diff --git a/app.py b/app.py
index 0da72341..41e2d199 100644
--- a/app.py
+++ b/app.py
@@ -1652,6 +1652,7 @@ async def thumbnail_publish_status(publish_id: str):
     generate_actor_images,
     get_elevenlabs_voices,
     DEFAULT_VOICES,
+    SUPPORTED_LANGUAGES,
 )
 
 # State for SaaSShorts jobs (separate from video processing jobs)
@@ -1679,6 +1680,8 @@ async def saasshorts_analyze(
 
     if not req.url and not req.description:
         raise HTTPException(status_code=400, detail="Provide a URL or a product description")
+    if req.language not in SUPPORTED_LANGUAGES:
+        raise HTTPException(status_code=400, detail=f"Unsupported language: {req.language}")
 
     try:
         loop = asyncio.get_event_loop()
@@ -2080,6 +2083,8 @@ async def saasshorts_generate(
         raise HTTPException(status_code=400, detail="Missing fal.ai API Key (X-Fal-Key header)")
     if not elevenlabs_key:
         raise HTTPException(status_code=400, detail="Missing ElevenLabs API Key (X-ElevenLabs-Key header)")
+    if req.script.get("language", "en") not in SUPPORTED_LANGUAGES:
+        raise HTTPException(status_code=400, detail=f"Unsupported language: {req.script.get('language')}")
 
     # Support retry: reuse output_dir so cached assets (image, voice, head, broll) are kept
     reused = False
@@ -2249,7 +2254,13 @@ async def saasshorts_voices(
     # Fallback to default voices
     return {
         "voices": [
-            {"voice_id": vid, "name": name, "category": "default"}
+            {
+                "voice_id": vid,
+                "name": name,
+                "category": "default",
+                "gender": "female" if "Female" in name else "male",
+                "labels": {"gender": "female" if "Female" in name else "male"},
+            }
             for name, vid in DEFAULT_VOICES.items()
         ],
         "source": "defaults",
diff --git a/dashboard/src/components/SaaShortsTab.jsx b/dashboard/src/components/SaaShortsTab.jsx
index 6ffadbb1..deda8760 100644
--- a/dashboard/src/components/SaaShortsTab.jsx
+++ b/dashboard/src/components/SaaShortsTab.jsx
@@ -10,6 +10,21 @@ const STYLE_OPTIONS = [
   { id: 'comparison', label: 'Before/After', desc: 'Comparison style' },
 ];
 
+const LANGUAGE_OPTIONS = [
+  { id: 'en', label: 'English', region: 'US' },
+  { id: 'es', label: 'Spanish', region: 'ES' },
+  { id: 'hi', label: 'Hindi', region: 'IN' },
+  { id: 'bn', label: 'Bengali', region: 'IN' },
+  { id: 'ta', label: 'Tamil', region: 'IN' },
+  { id: 'te', label: 'Telugu', region: 'IN' },
+  { id: 'mr', label: 'Marathi', region: 'IN' },
+  { id: 'gu', label: 'Gujarati', region: 'IN' },
+  { id: 'kn', label: 'Kannada', region: 'IN' },
+  { id: 'ml', label: 'Malayalam', region: 'IN' },
+  { id: 'pa', label: 'Punjabi', region: 'IN' },
+  { id: 'ur', label: 'Urdu', region: 'IN' },
+];
+
 const CACHE_KEY = 'saasshorts_cache';
 const CACHE_MAX_AGE = 24 * 60 * 60 * 1000; // 24 hours
 
@@ -61,6 +76,8 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
 
   // Step 2: Configure
   const [voices, setVoices] = useState([]);
+  const [voicesSource, setVoicesSource] = useState('defaults');
+  const [voicesLoading, setVoicesLoading] = useState(false);
   const [selectedVoice, setSelectedVoice] = useState('21m00Tcm4TlvDq8ikWAM');
   const [actorDescription, setActorDescription] = useState('');
   const [editedNarration, setEditedNarration] = useState('');
@@ -89,6 +106,7 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
 
   // UI
   const [copied, setCopied] = useState('');
+  const selectedLanguageOption = LANGUAGE_OPTIONS.find((l) => l.id === language) || LANGUAGE_OPTIONS[0];
   const [logsExpanded, setLogsExpanded] = useState(true);
 
   // Pre-fill from cache on mount
@@ -125,13 +143,13 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
       'es-male': 'ErXwobaYiN019PkySvjV',     // Antoni
     };
     // If we have fetched voices, pick the first matching one; otherwise use hardcoded default
-    const matchingVoice = voices.find(v => (v.labels?.gender || '').toLowerCase() === actorGender);
+    const matchingVoice = voices.find(v => (v.gender || v.labels?.gender || '').toLowerCase() === actorGender);
     if (matchingVoice) {
       setSelectedVoice(matchingVoice.voice_id);
     } else {
       setSelectedVoice(genderDefaults[`${language}-${actorGender}`] || genderDefaults['en-female']);
     }
-  }, [actorGender, language]);
+  }, [actorGender, language, voices]);
 
   // Poll generation status
   useEffect(() => {
@@ -171,6 +189,7 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
   }, [jobId, genStatus]);
 
   const fetchVoices = async () => {
+    setVoicesLoading(true);
     try {
       const res = await fetch(getApiUrl('/api/saasshorts/voices'), {
         headers: { 'X-ElevenLabs-Key': elevenLabsKey },
@@ -178,9 +197,12 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
       if (res.ok) {
         const data = await res.json();
         setVoices(data.voices || []);
+        setVoicesSource(data.source || 'elevenlabs');
       }
     } catch (e) {
       console.error('Voices fetch error:', e);
+    } finally {
+      setVoicesLoading(false);
     }
   };
 
@@ -270,6 +292,7 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
       const scriptToSend = { ...scripts[selectedScript] };
       scriptToSend._product_name = analysis?.product_name || analysis?.name || '';
       scriptToSend._product_url = url;
+      scriptToSend.language = language;
       if (editedNarration !== scriptToSend.full_narration) {
         scriptToSend.full_narration = editedNarration;
       }
@@ -316,6 +339,7 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
       const scriptToSend = { ...scripts[selectedScript] };
       scriptToSend._product_name = analysis?.product_name || analysis?.name || '';
       scriptToSend._product_url = url;
+      scriptToSend.language = language;
       if (editedNarration !== scriptToSend.full_narration) {
         scriptToSend.full_narration = editedNarration;
       }
@@ -496,21 +520,18 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
 
               <div>
                 <label className="block text-sm font-medium text-zinc-300 mb-3">Language</label>
-                <div className="flex gap-2 mb-6">
-                  {[
-                    { id: 'en', label: 'English', flag: '🇺🇸' },
-                    { id: 'es', label: 'Español', flag: '🇪🇸' },
-                  ].map((l) => (
+                <div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-2 mb-6">
+                  {LANGUAGE_OPTIONS.map((l) => (
                     <button
                       key={l.id}
                       onClick={() => setLanguage(l.id)}
-                      className={`flex-1 p-3 rounded-xl border text-center transition-all ${
+                      className={`p-3 rounded-xl border text-center transition-all ${
                         language === l.id
                           ? 'border-violet-500/50 bg-violet-500/10 text-violet-300'
                           : 'border-white/10 bg-white/5 text-zinc-400 hover:bg-white/10'
                       }`}
                     >
-                      <span className="text-lg">{l.flag}</span>
+                      <span className="text-[10px] font-mono text-zinc-500">{l.region}</span>
                       <div className="text-xs font-medium mt-1">{l.label}</div>
                     </button>
                   ))}
@@ -859,17 +880,24 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
               {/* Voice Selection */}
               <div>
                 <label className="block text-sm font-medium text-zinc-300 mb-2 flex items-center gap-2">
-                  <Volume2 size={14} /> Voice {language === 'es' ? '(Spanish)' : '(English)'}
+                  <Volume2 size={14} /> Voice ({selectedLanguageOption.label})
                 </label>
                 {(() => {
                   // Filter voices by language/accent
                   const filtered = voices.length > 0
                     ? voices.filter((v) => {
-                        const gender = (v.labels?.gender || '').toLowerCase();
-                        // Only show voices that match the selected gender
+                        const gender = (v.gender || v.labels?.gender || '').toLowerCase();
                         return gender === actorGender;
                       })
                       .sort((a, b) => {
+                        const aGender = (a.gender || a.labels?.gender || '').toLowerCase();
+                        const bGender = (b.gender || b.labels?.gender || '').toLowerCase();
+                        const aAccount = a.is_custom || a.is_premium ? 0 : 1;
+                        const bAccount = b.is_custom || b.is_premium ? 0 : 1;
+                        if (aAccount !== bAccount) return aAccount - bAccount;
+                        const aGenderScore = aGender === actorGender ? 0 : 1;
+                        const bGenderScore = bGender === actorGender ? 0 : 1;
+                        if (aGenderScore !== bGenderScore) return aGenderScore - bGenderScore;
                         const aAccent = (a.labels?.accent || '').toLowerCase();
                         const bAccent = (b.labels?.accent || '').toLowerCase();
                         if (language === 'es') {
@@ -899,8 +927,12 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
                             }`}
                           >
                             <div className="flex-1 min-w-0">
-                              <div className="text-sm font-medium truncate">{v.name}</div>
-                              <div className="text-[10px] text-zinc-500">
+                              <div className="text-sm font-medium truncate flex items-center gap-1.5">
+                                <span className="truncate">{v.name}</span>
+                                {v.is_premium && <span className="shrink-0 text-[9px] px-1.5 py-0.5 rounded bg-amber-500/15 text-amber-300 border border-amber-500/20">Premium</span>}
+                                {v.is_custom && !v.is_premium && <span className="shrink-0 text-[9px] px-1.5 py-0.5 rounded bg-violet-500/15 text-violet-300 border border-violet-500/20">Custom</span>}
+                              </div>
+                              <div className="text-[10px] text-zinc-500 truncate">
                                 {v.labels?.accent || ''} {v.labels?.gender || ''} {v.category ? `· ${v.category}` : ''}
                               </div>
                             </div>
@@ -941,7 +973,7 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
                     ],
                   };
                   const key = `${language}-${actorGender}`;
-                  const opts = defaults[key] || defaults['en-female'];
+                  const opts = defaults[key] || defaults[`en-${actorGender}`] || defaults['en-female'];
                   return (
                     <select value={selectedVoice} onChange={(e) => setSelectedVoice(e.target.value)} className="input-field">
                       {opts.map((o) => <option key={o.id} value={o.id}>{o.name}</option>)}
@@ -949,7 +981,11 @@ export default function SaaShortsTab({ geminiApiKey, elevenLabsKey, falKey, uplo
                   );
                 })()}
                 <p className="text-[10px] text-zinc-600 mt-1">
-                  {language === 'es'
+                  {voicesLoading
+                    ? 'Loading ElevenLabs account voices...'
+                    : voices.length > 0
+                    ? `${voices.length} voices loaded from ${voicesSource === 'defaults' ? 'defaults' : 'your ElevenLabs account'} · Premium and custom voices included when available`
+                    : language === 'es'
                     ? `Voces ${actorGender === 'female' ? 'femeninas' : 'masculinas'} · Todas hablan español con modelo multilingual · Click altavoz para preview`
                     : `${actorGender === 'female' ? 'Female' : 'Male'} voices · Click speaker to preview`}
                 </p>
diff --git a/saasshorts.py b/saasshorts.py
index 2a00472c..ab1e9b32 100644
--- a/saasshorts.py
+++ b/saasshorts.py
@@ -39,6 +39,36 @@
 
 GEMINI_MODEL = "gemini-3-flash-preview"
 
+SUPPORTED_LANGUAGES = {
+    "en": {
+        "name": "English",
+        "tone": "natural casual American English like a real person on TikTok",
+        "cta": '"link in bio"',
+        "examples": '"Okay so I just found this tool and...", "Stop doing this manually, there\'s a better way", "I can\'t believe nobody told me about this sooner..."',
+    },
+    "es": {
+        "name": "Spanish",
+        "tone": "natural casual Spanish for TikTok, suitable for Spain and Latin America",
+        "cta": '"enlace en la bio"',
+        "examples": '"Tio, no me puedo creer que nadie me haya dicho esto antes...", "Si usas Excel para esto, necesitas ver esto YA", "Os voy a ensenar algo que me ha cambiado la vida..."',
+    },
+    "hi": {"name": "Hindi", "tone": "natural conversational Hindi for Indian short-form video", "cta": '"link bio mein hai"', "examples": '"Agar aap ye kaam manually kar rahe ho, to ye dekho...", "Mujhe yakeen nahi hua ki ye tool itna simple hai..."'},
+    "bn": {"name": "Bengali", "tone": "natural conversational Bengali for Indian short-form video", "cta": '"link bio-te ache"', "examples": '"Ei tool ta dekhar por amar kaj onek easy hoye geche...", "Jodi eta manually korchen, tahole eta dekhen..."'},
+    "ta": {"name": "Tamil", "tone": "natural conversational Tamil for Indian short-form video", "cta": '"link bio-la irukku"', "examples": '"Indha tool pathi therinja apram work romba easy aayiduchu...", "Idha manual-a panreenga na, idha paarunga..."'},
+    "te": {"name": "Telugu", "tone": "natural conversational Telugu for Indian short-form video", "cta": '"link bio lo undi"', "examples": '"Ee tool chusaka work chala easy ayyindi...", "Meeru idi manual ga chestunte, idi chudandi..."'},
+    "mr": {"name": "Marathi", "tone": "natural conversational Marathi for Indian short-form video", "cta": '"link bio madhye aahe"', "examples": '"He tool baghitlyanantar majha kaam khup easy zala...", "Tumhi he manually kart asal tar he nakki paha..."'},
+    "gu": {"name": "Gujarati", "tone": "natural conversational Gujarati for Indian short-form video", "cta": '"link bio ma chhe"', "examples": '"Aa tool joya pachi kaam khub easy thai gayu...", "Tame aa manually karta hoy to aa jarur juo..."'},
+    "kn": {"name": "Kannada", "tone": "natural conversational Kannada for Indian short-form video", "cta": '"link bio nalli ide"', "examples": '"Ee tool nodida mele work tumba easy aytu...", "Neevu idanna manual aagi madtidre, idanna nodi..."'},
+    "ml": {"name": "Malayalam", "tone": "natural conversational Malayalam for Indian short-form video", "cta": '"link bio-il undu"', "examples": '"Ee tool kandathinu shesham work valare easy aayi...", "Ithu manual aayi cheyyunnengil, ithu nokku..."'},
+    "pa": {"name": "Punjabi", "tone": "natural conversational Punjabi for Indian short-form video", "cta": '"link bio vich hai"', "examples": '"Eh tool vekhan ton baad mera kaam bahut easy ho gaya...", "Je tusi eh manually kar rahe ho, ta eh zaroor vekho..."'},
+    "ur": {"name": "Urdu", "tone": "natural conversational Urdu for Indian short-form video", "cta": '"link bio mein hai"', "examples": '"Agar aap ye kaam manually kar rahe hain, to ye dekhein...", "Mujhe yaqeen nahi hua ke ye tool itna asan hai..."'},
+}
+
+
+def get_language_config(language: str) -> dict:
+    """Return language metadata, defaulting safely to English."""
+    return SUPPORTED_LANGUAGES.get(language, SUPPORTED_LANGUAGES["en"])
+
 
 # ═══════════════════════════════════════════════════════════════════════
 # Phase 1: Website Scraping, Web Research & Analysis
@@ -377,7 +407,8 @@ def generate_scripts(
     from google import genai
     from google.genai import types
 
-    lang_name = "Spanish" if language == "es" else "English"
+    lang_cfg = get_language_config(language)
+    lang_name = lang_cfg["name"]
     print(f"[SaaSShorts] 📝 Generating {num_scripts} scripts ({style}, {lang_name})...")
 
     client = genai.Client(api_key=gemini_key)
@@ -390,18 +421,10 @@ def generate_scripts(
         "comparison": "Before/after comparison.",
     }
 
-    lang_instructions = ""
-    if language == "es":
-        lang_instructions = """
-LANGUAGE: ALL narrations, subtitles, captions, and hashtags MUST be in SPANISH (Spain/Latin America).
-Use natural casual Spanish like a real person would speak on TikTok. Contractions, slang OK.
-Examples of Spanish UGC hooks: "Tío, no me puedo creer que nadie me haya dicho esto antes...", "Si usas Excel para esto, necesitas ver esto YA", "Os voy a enseñar algo que me ha cambiado la vida..."
-"""
-    else:
-        lang_instructions = """
-LANGUAGE: ALL narrations, subtitles, captions, and hashtags MUST be in ENGLISH.
-Use natural casual American English like a real person on TikTok. Contractions, slang OK.
-Examples of English UGC hooks: "Okay so I just found this tool and...", "Stop doing this manually, there's a better way", "I can't believe nobody told me about this sooner..."
+    lang_instructions = f"""
+LANGUAGE: ALL narrations, subtitles, captions, overlays, CTA text, and hashtags MUST be in {lang_name.upper()} only.
+Use {lang_cfg["tone"]}. Do not mix English or Spanish unless it is an unavoidable brand/product name.
+Examples of {lang_name} UGC hooks, shown as style references: {lang_cfg["examples"]}
 """
 
     prompt = f"""You are a viral short-form video scriptwriter for TikTok/Instagram Reels.
@@ -491,7 +514,8 @@ def generate_scripts(
         "full_narration": "All narration text joined (only actor_talking segments)",
         "actor_description": "Specific person description: age, gender, ethnicity, hair style, clothing. Casual everyday look.",
         "hashtags": ["#saas", "#productivity", "#techtools"],
-        "caption": "Suggested Instagram/TikTok caption"
+        "caption": "Suggested Instagram/TikTok caption",
+        "language": "{language}"
     }}
 ]
 
@@ -507,6 +531,8 @@ def generate_scripts(
 - Vary actor demographics across scripts
 - CTA MUST always mention "link in bio" / "enlace en la bio". Examples: "Link in bio, go try it", "Check the link in my bio", "El enlace está en la bio, probadlo"
 - Write ALL text in {lang_name}
+- For this selected language, CTA MUST use the local phrase {lang_cfg["cta"]}; do not use English CTA wording unless the selected language is English.
+- Set the script field "language" to "{language}".
 - Actor gender: {actor_gender}. ALL actor_description fields MUST describe a {actor_gender} person. Use diverse ages/ethnicities across scripts.
 - IMPORTANT: actor_description MUST ALWAYS be in ENGLISH regardless of script language. Only describe physical appearance: age, gender, ethnicity, hair, clothing. NO actions, NO background, NO scene description.
 - Actors must look European, attractive but natural, slightly nerdy/tech vibe. Vary across: blonde, brunette, redhead. Ages 22-35.
@@ -543,6 +569,10 @@ def generate_scripts(
         raise Exception(f"Failed to parse scripts JSON: {e}\nRaw: {text[:500]}")
 
     print(f"[SaaSShorts] ✅ Generated {len(scripts)} scripts")
+    for script in scripts:
+        if isinstance(script, dict):
+            script["language"] = language
+
     return scripts
 
 
@@ -794,26 +824,127 @@ def generate_voiceover(
 
 
 def get_elevenlabs_voices(elevenlabs_key: str) -> list:
-    """Fetch available voices from ElevenLabs."""
-    url = f"{ELEVENLABS_API_BASE}/voices"
+    """Fetch available account voices from ElevenLabs, including premium and custom voices."""
     headers = {"xi-api-key": elevenlabs_key}
 
-    with httpx.Client(timeout=15.0) as client:
-        resp = client.get(url, headers=headers)
-        if resp.status_code != 200:
-            return []
-        data = resp.json()
-
     voices = []
-    for v in data.get("voices", []):
+    seen = set()
+
+    def normalize_gender(v: dict, labels: dict, sharing: dict) -> str:
+        raw = str(labels.get("gender") or sharing.get("labels", {}).get("gender") or "").strip().lower()
+        if raw in {"female", "woman", "feminine"}:
+            return "female"
+        if raw in {"male", "man", "masculine"}:
+            return "male"
+
+        haystack = " ".join(
+            str(part or "").lower()
+            for part in [
+                v.get("name"),
+                v.get("description"),
+                sharing.get("name"),
+                sharing.get("description"),
+            ]
+        )
+        if any(token in haystack for token in ["female", "woman", "girl", "feminine"]):
+            return "female"
+        if any(token in haystack for token in ["male", " man ", "boy", "masculine"]):
+            return "male"
+        return ""
+
+    def add_voice(v: dict, source: str = "elevenlabs") -> None:
+        voice_id = v.get("voice_id")
+        if not voice_id or voice_id in seen:
+            return
+        seen.add(voice_id)
+
+        sharing = v.get("sharing") or {}
+        labels = v.get("labels") or sharing.get("labels") or {}
+        category = v.get("category") or sharing.get("category") or ""
+        is_custom = category in {"cloned", "generated", "professional"} or bool(v.get("is_owner"))
+        is_premium = category == "professional" or sharing.get("financial_rewards_enabled") is True
+        gender = normalize_gender(v, labels, sharing)
+        if gender and not labels.get("gender"):
+            labels = {**labels, "gender": gender}
+
         voices.append({
-            "voice_id": v["voice_id"],
-            "name": v["name"],
-            "category": v.get("category", ""),
-            "labels": v.get("labels", {}),
-            "preview_url": v.get("preview_url", ""),
+            "voice_id": voice_id,
+            "name": v.get("name") or sharing.get("name") or "Untitled voice",
+            "category": category,
+            "labels": labels,
+            "gender": gender,
+            "description": v.get("description") or sharing.get("description") or "",
+            "preview_url": v.get("preview_url") or "",
+            "available_for_tiers": v.get("available_for_tiers") or [],
+            "verified_languages": v.get("verified_languages") or [],
+            "high_quality_base_model_ids": v.get("high_quality_base_model_ids") or [],
+            "voice_type": v.get("voice_type") or "",
+            "is_owner": bool(v.get("is_owner")),
+            "is_custom": is_custom,
+            "is_premium": is_premium,
+            "source": source,
         })
 
+    with httpx.Client(timeout=45.0) as client:
+        # v2 returns all voices available to the authenticated account and supports
+        # pagination plus filters for default, personal, workspace, community,
+        # saved, cloned, generated, and professional voices.
+        v2_url = f"{ELEVENLABS_API_BASE.replace('/v1', '/v2')}/voices"
+        query_sets = [{}]
+        query_sets.extend({"voice_type": voice_type} for voice_type in [
+            "personal",
+            "community",
+            "default",
+            "workspace",
+            "non-default",
+            "non-community",
+            "saved",
+        ])
+        query_sets.extend({"category": category} for category in [
+            "premade",
+            "cloned",
+            "generated",
+            "professional",
+        ])
+
+        for extra_params in query_sets:
+            next_page_token = None
+            for _ in range(10):
+                params = {
+                    "page_size": 100,
+                    "include_total_count": "false",
+                    "sort": "name",
+                    "sort_direction": "asc",
+                }
+                params.update(extra_params)
+                if next_page_token:
+                    params["next_page_token"] = next_page_token
+
+                resp = client.get(v2_url, headers=headers, params=params)
+                if resp.status_code == 404:
+                    break
+                if resp.status_code != 200:
+                    break
+
+                data = resp.json()
+                for v in data.get("voices", []):
+                    add_voice(v, "elevenlabs-v2")
+
+                if not data.get("has_more") or not data.get("next_page_token"):
+                    break
+                next_page_token = data["next_page_token"]
+
+        if voices:
+            return voices
+
+        # Fallback for older ElevenLabs accounts or deployments that still expose v1 only.
+        resp = client.get(f"{ELEVENLABS_API_BASE}/voices", headers=headers)
+        if resp.status_code != 200:
+            return []
+        data = resp.json()
+        for v in data.get("voices", []):
+            add_voice(v, "elevenlabs-v1")
+
     return voices
 
 
@@ -1046,7 +1177,7 @@ def _format_ass_time(seconds: float) -> str:
     return f"{h}:{m:02d}:{s:02d}.{cs:02d}"
 
 
-def transcribe_audio_for_subs(audio_path: str) -> list:
+def transcribe_audio_for_subs(audio_path: str, language: str = "en") -> list:
     """
     Transcribe audio with word-level timestamps using faster-whisper.
     Returns list of {"word": str, "start": float, "end": float}.
@@ -1055,7 +1186,8 @@ def transcribe_audio_for_subs(audio_path: str) -> list:
 
     print(f"[SaaSShorts] 🎙️ Transcribing audio for subtitles...")
     model = WhisperModel("base", device="cpu", compute_type="int8")
-    segments, info = model.transcribe(audio_path, word_timestamps=True)
+    whisper_language = language if language in SUPPORTED_LANGUAGES else None
+    segments, info = model.transcribe(audio_path, word_timestamps=True, language=whisper_language)
 
     words = []
     for segment in segments:
@@ -1071,14 +1203,14 @@ def transcribe_audio_for_subs(audio_path: str) -> list:
     return words
 
 
-def generate_tiktok_subs(audio_path: str, output_path: str, max_words: int = 3) -> str:
+def generate_tiktok_subs(audio_path: str, output_path: str, max_words: int = 3, language: str = "en") -> str:
     """
     Generate TikTok-style ASS subtitles from audio using Whisper transcription.
 
     Style: Big bold centered text, 1-3 words at a time, white with black outline.
     Matches actual spoken words with precise timestamps.
     """
-    words = transcribe_audio_for_subs(audio_path)
+    words = transcribe_audio_for_subs(audio_path, language=language)
     if not words:
         # Fallback: empty subtitle file
         with open(output_path, "w") as f:
@@ -1316,6 +1448,7 @@ def generate_full_video(
     elevenlabs_key = config["elevenlabs_key"]
     voice_id = config.get("voice_id", "21m00Tcm4TlvDq8ikWAM")
     actor_desc = config.get("actor_description") or script.get("actor_description", "a young professional in their late 20s, wearing a casual modern outfit, clean background")
+    language = script.get("language", "en")
 
     title_slug = re.sub(r"[^a-z0-9]+", "_", script.get("title", "video").lower())[:30]
 
@@ -1434,7 +1567,7 @@ def _exists(path):
 
     # ── Step 5: Generate subtitles (from actual audio, not script text) ──
     log("[5/6] Transcribing audio and generating TikTok-style subtitles...")
-    generate_tiktok_subs(audio_path, srt_path, max_words=2)
+    generate_tiktok_subs(audio_path, srt_path, max_words=2, language=language)
 
     # ── Step 6: Composite final video ──
     log("[6/6] Compositing final video with FFmpeg...")