diff --git a/src/components/ColorPicker.tsx b/src/components/ColorPicker.tsx
index 9dbefd1..2f015ea 100644
--- a/src/components/ColorPicker.tsx
+++ b/src/components/ColorPicker.tsx
@@ -1,4 +1,5 @@
 import { useState, useRef, useEffect, useMemo, useCallback } from 'react'
+import { createPortal } from 'react-dom'
 
 interface ColorPickerProps {
   value: string
@@ -8,7 +9,7 @@ interface ColorPickerProps {
   disabled?: boolean
 }
 
-// Check if running in Telegram WebApp (native color picker causes crash)
+// Check if running in Telegram WebApp
 const isTelegramWebApp = (): boolean => {
   return !!(window as unknown as { Telegram?: { WebApp?: unknown } }).Telegram?.WebApp
 }
@@ -30,109 +31,330 @@ const rgbToHex = (r: number, g: number, b: number): string => {
   return '#' + [r, g, b].map(x => x.toString(16).padStart(2, '0')).join('')
 }
 
+// Convert RGB to HSL
+const rgbToHsl = (r: number, g: number, b: number): { h: number; s: number; l: number } => {
+  r /= 255; g /= 255; b /= 255
+  const max = Math.max(r, g, b), min = Math.min(r, g, b)
+  let h = 0, s = 0
+  const l = (max + min) / 2
+  if (max !== min) {
+    const d = max - min
+    s = l > 0.5 ? d / (2 - max - min) : d / (max + min)
+    switch (max) {
+      case r: h = ((g - b) / d + (g < b ? 6 : 0)) / 6; break
+      case g: h = ((b - r) / d + 2) / 6; break
+      case b: h = ((r - g) / d + 4) / 6; break
+    }
+  }
+  return { h: Math.round(h * 360), s: Math.round(s * 100), l: Math.round(l * 100) }
+}
+
+// Convert HSL to RGB
+const hslToRgb = (h: number, s: number, l: number): { r: number; g: number; b: number } => {
+  h /= 360; s /= 100; l /= 100
+  let r, g, b
+  if (s === 0) {
+    r = g = b = l
+  } else {
+    const hue2rgb = (p: number, q: number, t: number) => {
+      if (t < 0) t += 1
+      if (t > 1) t -= 1
+      if (t < 1/6) return p + (q - p) * 6 * t
+      if (t < 1/2) return q
+      if (t < 2/3) return p + (q - p) * (2/3 - t) * 6
+      return p
+    }
+    const q = l < 0.5 ? l * (1 + s) : l + s - l * s
+    const p = 2 * l - q
+    r = hue2rgb(p, q, h + 1/3)
+    g = hue2rgb(p, q, h)
+    b = hue2rgb(p, q, h - 1/3)
+  }
+  return { r: Math.round(r * 255), g: Math.round(g * 255), b: Math.round(b * 255) }
+}
+
 const PRESET_COLORS = [
-  '#3b82f6', // Blue
-  '#ef4444', // Red
-  '#22c55e', // Green
-  '#f59e0b', // Amber
-  '#8b5cf6', // Violet
-  '#ec4899', // Pink
-  '#06b6d4', // Cyan
-  '#14b8a6', // Teal
-  '#84cc16', // Lime
-  '#f97316', // Orange
-  '#6366f1', // Indigo
-  '#a855f7', // Purple
-  '#ffffff', // White
-  '#64748b', // Slate
-  '#1e293b', // Dark
-  '#000000', // Black
+  '#3b82f6', '#ef4444', '#22c55e', '#f59e0b',
+  '#8b5cf6', '#ec4899', '#06b6d4', '#14b8a6',
+  '#84cc16', '#f97316', '#6366f1', '#a855f7',
 ]
 
 export function ColorPicker({ value, onChange, label, description, disabled }: ColorPickerProps) {
   const [isOpen, setIsOpen] = useState(false)
   const [localValue, setLocalValue] = useState(value)
-  const [rgb, setRgb] = useState(() => hexToRgb(value))
-  const containerRef = useRef<HTMLDivElement>(null)
+  const [hsl, setHsl] = useState(() => {
+    const rgb = hexToRgb(value)
+    return rgbToHsl(rgb.r, rgb.g, rgb.b)
+  })
+  const [pickerPosition, setPickerPosition] = useState<{ top: number; left: number; openUp: boolean }>({ top: 0, left: 0, openUp: false })
+
+  const buttonRef = useRef<HTMLButtonElement>(null)
+  const pickerRef = useRef<HTMLDivElement>(null)
   const colorInputRef = useRef<HTMLInputElement>(null)
 
-  // Memoize Telegram check to avoid recalculating
   const isTelegram = useMemo(() => isTelegramWebApp(), [])
 
+  // Sync with external value
   useEffect(() => {
     setLocalValue(value)
-    setRgb(hexToRgb(value))
+    const rgb = hexToRgb(value)
+    setHsl(rgbToHsl(rgb.r, rgb.g, rgb.b))
   }, [value])
 
-  // Handle RGB slider change
-  const handleRgbChange = useCallback((channel: 'r' | 'g' | 'b', val: number) => {
-    const newRgb = { ...rgb, [channel]: val }
-    setRgb(newRgb)
-    const hex = rgbToHex(newRgb.r, newRgb.g, newRgb.b)
-    setLocalValue(hex)
-    onChange(hex)
-  }, [rgb, onChange])
+  // Calculate picker position
+  const updatePosition = useCallback(() => {
+    if (!buttonRef.current) return
 
-  // Close on outside click
-  useEffect(() => {
-    function handleClickOutside(event: MouseEvent) {
-      if (containerRef.current && !containerRef.current.contains(event.target as Node)) {
-        setIsOpen(false)
-      }
+    const rect = buttonRef.current.getBoundingClientRect()
+    const pickerHeight = 320
+    const pickerWidth = 280
+    const padding = 12
+
+    // Check if there's space below
+    const spaceBelow = window.innerHeight - rect.bottom
+    const spaceAbove = rect.top
+    const openUp = spaceBelow < pickerHeight + padding && spaceAbove > spaceBelow
+
+    // Calculate left position (ensure it stays in viewport)
+    let left = rect.left
+    if (left + pickerWidth > window.innerWidth - padding) {
+      left = window.innerWidth - pickerWidth - padding
     }
-    document.addEventListener('mousedown', handleClickOutside)
-    return () => document.removeEventListener('mousedown', handleClickOutside)
+    if (left < padding) left = padding
+
+    setPickerPosition({
+      top: openUp ? rect.top - pickerHeight - 8 : rect.bottom + 8,
+      left,
+      openUp
+    })
   }, [])
 
-  const handleColorInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  // Open picker
+  const handleOpen = useCallback(() => {
+    if (disabled) return
+    updatePosition()
+    setIsOpen(true)
+  }, [disabled, updatePosition])
+
+  // Close picker
+  const handleClose = useCallback(() => {
+    setIsOpen(false)
+  }, [])
+
+  // Handle click outside
+  useEffect(() => {
+    if (!isOpen) return
+
+    const handleClickOutside = (e: MouseEvent) => {
+      if (
+        pickerRef.current && !pickerRef.current.contains(e.target as Node) &&
+        buttonRef.current && !buttonRef.current.contains(e.target as Node)
+      ) {
+        handleClose()
+      }
+    }
+
+    const handleScroll = () => handleClose()
+    const handleResize = () => updatePosition()
+
+    document.addEventListener('mousedown', handleClickOutside)
+    document.addEventListener('touchstart', handleClickOutside as EventListener)
+    window.addEventListener('scroll', handleScroll, true)
+    window.addEventListener('resize', handleResize)
+
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside)
+      document.removeEventListener('touchstart', handleClickOutside as EventListener)
+      window.removeEventListener('scroll', handleScroll, true)
+      window.removeEventListener('resize', handleResize)
+    }
+  }, [isOpen, handleClose, updatePosition])
+
+  // Update color from HSL
+  const updateColorFromHsl = useCallback((newHsl: { h: number; s: number; l: number }) => {
+    const rgb = hslToRgb(newHsl.h, newHsl.s, newHsl.l)
+    const hex = rgbToHex(rgb.r, rgb.g, rgb.b)
+    setHsl(newHsl)
+    setLocalValue(hex)
+    onChange(hex)
+  }, [onChange])
+
+  // Handle hue change
+  const handleHueChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    updateColorFromHsl({ ...hsl, h: parseInt(e.target.value) })
+  }, [hsl, updateColorFromHsl])
+
+  // Handle saturation change
+  const handleSaturationChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    updateColorFromHsl({ ...hsl, s: parseInt(e.target.value) })
+  }, [hsl, updateColorFromHsl])
+
+  // Handle lightness change
+  const handleLightnessChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    updateColorFromHsl({ ...hsl, l: parseInt(e.target.value) })
+  }, [hsl, updateColorFromHsl])
+
+  // Handle native color input
+  const handleColorInputChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
     const newColor = e.target.value
     setLocalValue(newColor)
-    setRgb(hexToRgb(newColor))
+    const rgb = hexToRgb(newColor)
+    setHsl(rgbToHsl(rgb.r, rgb.g, rgb.b))
     onChange(newColor)
-  }
+  }, [onChange])
 
-  const handleHexInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  // Handle hex input
+  const handleHexInputChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
     let newValue = e.target.value
-
-    // Add # if not present
     if (newValue && !newValue.startsWith('#')) {
       newValue = '#' + newValue
     }
-
-    // Validate hex format
     if (newValue === '' || newValue.match(/^#[0-9A-Fa-f]{0,6}$/)) {
       setLocalValue(newValue)
-
-      // Only trigger onChange and update RGB for valid complete hex
       if (newValue.match(/^#[0-9A-Fa-f]{6}$/)) {
-        setRgb(hexToRgb(newValue))
+        const rgb = hexToRgb(newValue)
+        setHsl(rgbToHsl(rgb.r, rgb.g, rgb.b))
         onChange(newValue)
       }
     }
-  }
+  }, [onChange])
 
-  const handlePresetClick = (color: string) => {
+  // Handle preset click
+  const handlePresetClick = useCallback((color: string) => {
     setLocalValue(color)
-    setRgb(hexToRgb(color))
+    const rgb = hexToRgb(color)
+    setHsl(rgbToHsl(rgb.r, rgb.g, rgb.b))
     onChange(color)
-    setIsOpen(false)
-  }
+    handleClose()
+  }, [onChange, handleClose])
+
+  // Picker content
+  const pickerContent = isOpen ? (
+    <div
+      ref={pickerRef}
+      className="fixed z-[9999] w-[280px] bg-dark-900 rounded-2xl border border-dark-700 shadow-2xl overflow-hidden"
+      style={{
+        top: pickerPosition.top,
+        left: pickerPosition.left,
+      }}
+      onClick={(e) => e.stopPropagation()}
+    >
+      {/* Color preview header */}
+      <div
+        className="h-16 w-full"
+        style={{ backgroundColor: localValue || '#000000' }}
+      />
+
+      {/* Controls */}
+      <div className="p-4 space-y-4">
+        {/* Hue slider */}
+        <div className="space-y-1.5">
+          <div className="flex items-center justify-between">
+            <span className="text-xs font-medium text-dark-400">Hue</span>
+            <span className="text-xs text-dark-500">{hsl.h}°</span>
+          </div>
+          <input
+            type="range"
+            min="0"
+            max="360"
+            value={hsl.h}
+            onChange={handleHueChange}
+            className="w-full h-3 rounded-full appearance-none cursor-pointer"
+            style={{
+              background: 'linear-gradient(to right, #ff0000, #ffff00, #00ff00, #00ffff, #0000ff, #ff00ff, #ff0000)',
+            }}
+          />
+        </div>
+
+        {/* Saturation slider */}
+        <div className="space-y-1.5">
+          <div className="flex items-center justify-between">
+            <span className="text-xs font-medium text-dark-400">Saturation</span>
+            <span className="text-xs text-dark-500">{hsl.s}%</span>
+          </div>
+          <input
+            type="range"
+            min="0"
+            max="100"
+            value={hsl.s}
+            onChange={handleSaturationChange}
+            className="w-full h-3 rounded-full appearance-none cursor-pointer"
+            style={{
+              background: `linear-gradient(to right, hsl(${hsl.h}, 0%, ${hsl.l}%), hsl(${hsl.h}, 100%, ${hsl.l}%))`,
+            }}
+          />
+        </div>
+
+        {/* Lightness slider */}
+        <div className="space-y-1.5">
+          <div className="flex items-center justify-between">
+            <span className="text-xs font-medium text-dark-400">Lightness</span>
+            <span className="text-xs text-dark-500">{hsl.l}%</span>
+          </div>
+          <input
+            type="range"
+            min="0"
+            max="100"
+            value={hsl.l}
+            onChange={handleLightnessChange}
+            className="w-full h-3 rounded-full appearance-none cursor-pointer"
+            style={{
+              background: `linear-gradient(to right, #000000, hsl(${hsl.h}, ${hsl.s}%, 50%), #ffffff)`,
+            }}
+          />
+        </div>
+
+        {/* Hex input */}
+        <div className="flex items-center gap-2">
+          <span className="text-xs font-medium text-dark-400">HEX</span>
+          <input
+            type="text"
+            value={localValue}
+            onChange={handleHexInputChange}
+            className="flex-1 h-9 px-3 text-sm font-mono uppercase bg-dark-800 border border-dark-700 rounded-lg text-dark-100 focus:outline-none focus:border-accent-500"
+            placeholder="#000000"
+            maxLength={7}
+          />
+        </div>
+
+        {/* Presets */}
+        <div className="pt-2 border-t border-dark-700">
+          <span className="text-xs font-medium text-dark-400 block mb-2">Presets</span>
+          <div className="grid grid-cols-6 gap-1.5">
+            {PRESET_COLORS.map((preset) => (
+              <button
+                key={preset}
+                onClick={() => handlePresetClick(preset)}
+                className={`w-full aspect-square rounded-lg transition-transform hover:scale-110 active:scale-95 ${
+                  localValue.toLowerCase() === preset.toLowerCase()
+                    ? 'ring-2 ring-white ring-offset-2 ring-offset-dark-900'
+                    : ''
+                }`}
+                style={{ backgroundColor: preset }}
+                title={preset}
+              />
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  ) : null
 
   return (
-    <div ref={containerRef} className="relative">
+    <div className="relative">
       <label className="block text-sm font-medium text-dark-200 mb-1">{label}</label>
       {description && <p className="text-xs text-dark-500 mb-2">{description}</p>}
 
       <div className="flex items-center gap-3">
-        {/* Color preview button - min 44px for touch accessibility */}
+        {/* Color preview button */}
         <button
+          ref={buttonRef}
           type="button"
-          onClick={() => !disabled && setIsOpen(!isOpen)}
+          onClick={handleOpen}
           disabled={disabled}
-          className="w-11 h-11 rounded-lg border-2 border-dark-700 shadow-inner transition-all hover:scale-105 hover:border-dark-600 disabled:opacity-50 disabled:cursor-not-allowed flex-shrink-0"
+          className="w-11 h-11 rounded-xl border-2 border-dark-700 shadow-inner transition-all hover:scale-105 hover:border-dark-600 disabled:opacity-50 disabled:cursor-not-allowed flex-shrink-0"
           style={{ backgroundColor: localValue || '#000000' }}
           title={localValue}
-          aria-label={`Select color: ${localValue}`}
         />
 
         {/* Hex input */}
@@ -141,12 +363,12 @@ export function ColorPicker({ value, onChange, label, description, disabled }: C
           value={localValue}
           onChange={handleHexInputChange}
           disabled={disabled}
-          className="input w-28 py-2 font-mono text-sm uppercase"
+          className="w-28 h-11 px-3 font-mono text-sm uppercase bg-dark-800 border border-dark-700 rounded-xl text-dark-100 focus:outline-none focus:border-accent-500 disabled:opacity-50"
           placeholder="#000000"
           maxLength={7}
         />
 
-        {/* Native color picker - hidden in Telegram WebApp (causes crash) */}
+        {/* Native color picker button (hidden in Telegram) */}
         {!isTelegram && (
           <>
             <input
@@ -157,124 +379,23 @@ export function ColorPicker({ value, onChange, label, description, disabled }: C
               disabled={disabled}
               className="sr-only"
             />
-
-            {/* Native picker button - min 44px for touch accessibility */}
             <button
               type="button"
               onClick={() => colorInputRef.current?.click()}
               disabled={disabled}
-              className="btn-secondary min-w-[44px] min-h-[44px] p-2.5 disabled:opacity-50"
-              title="Open color picker"
-              aria-label="Open color picker"
+              className="w-11 h-11 flex items-center justify-center rounded-xl bg-dark-800 border border-dark-700 text-dark-400 hover:text-dark-200 hover:bg-dark-700 transition-colors disabled:opacity-50"
+              title="System color picker"
             >
               <svg className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={1.5}>
-                <path
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  d="M4.098 19.902a3.75 3.75 0 005.304 0l6.401-6.402M6.75 21A3.75 3.75 0 013 17.25V4.125C3 3.504 3.504 3 4.125 3h5.25c.621 0 1.125.504 1.125 1.125v4.072M6.75 21a3.75 3.75 0 003.75-3.75V8.197M6.75 21h13.125c.621 0 1.125-.504 1.125-1.125v-5.25c0-.621-.504-1.125-1.125-1.125h-4.072M10.5 8.197l2.88-2.88c.438-.439 1.15-.439 1.59 0l3.712 3.713c.44.44.44 1.152 0 1.59l-2.879 2.88M6.75 17.25h.008v.008H6.75v-.008z"
-                />
+                <path strokeLinecap="round" strokeLinejoin="round" d="M4.098 19.902a3.75 3.75 0 005.304 0l6.401-6.402M6.75 21A3.75 3.75 0 013 17.25V4.125C3 3.504 3.504 3 4.125 3h5.25c.621 0 1.125.504 1.125 1.125v4.072M6.75 21a3.75 3.75 0 003.75-3.75V8.197M6.75 21h13.125c.621 0 1.125-.504 1.125-1.125v-5.25c0-.621-.504-1.125-1.125-1.125h-4.072M10.5 8.197l2.88-2.88c.438-.439 1.15-.439 1.59 0l3.712 3.713c.44.44.44 1.152 0 1.59l-2.879 2.88M6.75 17.25h.008v.008H6.75v-.008z" />
               </svg>
             </button>
           </>
         )}
       </div>
 
-      {/* Dropdown with presets and RGB sliders */}
-      {isOpen && (
-        <div className="absolute z-50 mt-2 p-3 sm:p-4 bg-dark-800 rounded-xl border border-dark-700 shadow-xl animate-fade-in w-[calc(100vw-2rem)] sm:w-80 max-w-sm left-0 sm:left-auto">
-          {/* RGB Sliders - always visible on all devices */}
-          <div className="mb-3 pb-3 border-b border-dark-700">
-            <div className="text-xs text-dark-400 mb-3">RGB</div>
-            <div className="space-y-3 sm:space-y-2">
-              {/* Red */}
-              <div className="flex items-center gap-2 sm:gap-3">
-                <span className="text-xs font-medium text-red-400 w-4 flex-shrink-0">R</span>
-                <input
-                  type="range"
-                  min="0"
-                  max="255"
-                  value={rgb.r}
-                  onChange={(e) => handleRgbChange('r', parseInt(e.target.value))}
-                  className="flex-1 h-3 sm:h-2 rounded-full appearance-none cursor-pointer touch-pan-x"
-                  style={{
-                    background: `linear-gradient(to right, rgb(0,${rgb.g},${rgb.b}), rgb(255,${rgb.g},${rgb.b}))`,
-                  }}
-                />
-                <input
-                  type="number"
-                  min="0"
-                  max="255"
-                  value={rgb.r}
-                  onChange={(e) => handleRgbChange('r', Math.min(255, Math.max(0, parseInt(e.target.value) || 0)))}
-                  className="w-14 sm:w-12 text-xs text-center bg-dark-700 border border-dark-600 rounded px-1 py-1 text-dark-200"
-                />
-              </div>
-              {/* Green */}
-              <div className="flex items-center gap-2 sm:gap-3">
-                <span className="text-xs font-medium text-green-400 w-4 flex-shrink-0">G</span>
-                <input
-                  type="range"
-                  min="0"
-                  max="255"
-                  value={rgb.g}
-                  onChange={(e) => handleRgbChange('g', parseInt(e.target.value))}
-                  className="flex-1 h-3 sm:h-2 rounded-full appearance-none cursor-pointer touch-pan-x"
-                  style={{
-                    background: `linear-gradient(to right, rgb(${rgb.r},0,${rgb.b}), rgb(${rgb.r},255,${rgb.b}))`,
-                  }}
-                />
-                <input
-                  type="number"
-                  min="0"
-                  max="255"
-                  value={rgb.g}
-                  onChange={(e) => handleRgbChange('g', Math.min(255, Math.max(0, parseInt(e.target.value) || 0)))}
-                  className="w-14 sm:w-12 text-xs text-center bg-dark-700 border border-dark-600 rounded px-1 py-1 text-dark-200"
-                />
-              </div>
-              {/* Blue */}
-              <div className="flex items-center gap-2 sm:gap-3">
-                <span className="text-xs font-medium text-blue-400 w-4 flex-shrink-0">B</span>
-                <input
-                  type="range"
-                  min="0"
-                  max="255"
-                  value={rgb.b}
-                  onChange={(e) => handleRgbChange('b', parseInt(e.target.value))}
-                  className="flex-1 h-3 sm:h-2 rounded-full appearance-none cursor-pointer touch-pan-x"
-                  style={{
-                    background: `linear-gradient(to right, rgb(${rgb.r},${rgb.g},0), rgb(${rgb.r},${rgb.g},255))`,
-                  }}
-                />
-                <input
-                  type="number"
-                  min="0"
-                  max="255"
-                  value={rgb.b}
-                  onChange={(e) => handleRgbChange('b', Math.min(255, Math.max(0, parseInt(e.target.value) || 0)))}
-                  className="w-14 sm:w-12 text-xs text-center bg-dark-700 border border-dark-600 rounded px-1 py-1 text-dark-200"
-                />
-              </div>
-            </div>
-          </div>
-
-          <div className="text-xs text-dark-400 mb-2">Preset colors</div>
-          <div className="grid grid-cols-4 gap-2 sm:gap-1">
-            {PRESET_COLORS.map((preset) => (
-              <button
-                key={preset}
-                onClick={() => handlePresetClick(preset)}
-                className={`min-w-[40px] min-h-[40px] sm:min-w-[44px] sm:min-h-[44px] w-full aspect-square rounded-lg border-2 transition-all hover:scale-105 active:scale-95 ${
-                  localValue.toLowerCase() === preset.toLowerCase() ? 'border-white ring-2 ring-white/30' : 'border-dark-600 hover:border-dark-500'
-                }`}
-                style={{ backgroundColor: preset }}
-                title={preset}
-                aria-label={`Select color ${preset}`}
-              />
-            ))}
-          </div>
-        </div>
-      )}
+      {/* Render picker in portal */}
+      {typeof document !== 'undefined' && createPortal(pickerContent, document.body)}
     </div>
   )
 }