From a080ef5a8ec10275337473df79bd602a508c0404 Mon Sep 17 00:00:00 2001
From: "diana.dolgolyova" <diana.dolgolyova@gmail.com>
Date: Fri, 10 Apr 2026 21:36:33 +0300
Subject: [PATCH] fix: remaining admin & layout light theme polish

- Admin forms, dialogs, and page editors: light-mode borders, text contrast
- YandexMap: theme-aware map styles
- Layout: theme init script adjustments
---
 src/app/admin/_components/ConfirmDialog.tsx  | 10 ++--
 src/app/admin/_components/FormField.tsx      | 62 ++++++++++----------
 src/app/admin/_components/ImageCropField.tsx | 10 ++--
 src/app/admin/_components/PriceField.tsx     |  6 +-
 src/app/admin/about/page.tsx                 |  2 +-
 src/app/admin/bookings/AddBookingModal.tsx   | 28 ++++-----
 src/app/admin/bookings/SearchBar.tsx         |  4 +-
 src/app/admin/classes/page.tsx               | 12 ++--
 src/app/admin/contact/page.tsx               | 12 ++--
 src/app/admin/layout.tsx                     | 28 +++++----
 src/app/admin/login/page.tsx                 | 14 ++---
 src/app/admin/master-classes/page.tsx        | 30 +++++-----
 src/app/admin/page.tsx                       | 14 ++---
 src/app/admin/schedule/page.tsx              | 42 ++++++-------
 src/app/admin/team/page.tsx                  |  8 +--
 src/app/layout.tsx                           |  9 ++-
 src/components/ui/YandexMap.tsx              | 30 ++++++++--
 17 files changed, 177 insertions(+), 144 deletions(-)

diff --git a/src/app/admin/_components/ConfirmDialog.tsx b/src/app/admin/_components/ConfirmDialog.tsx
index e98123d..2248706 100644
--- a/src/app/admin/_components/ConfirmDialog.tsx
+++ b/src/app/admin/_components/ConfirmDialog.tsx
@@ -52,13 +52,13 @@ export function ConfirmDialog({
     >
       <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" />
       <div
-        className="relative w-full max-w-sm rounded-2xl border border-white/[0.08] bg-neutral-900 p-6 shadow-2xl"
+        className="relative w-full max-w-sm rounded-2xl border border-neutral-200 bg-white p-6 shadow-2xl dark:border-white/[0.08] dark:bg-neutral-900"
         onClick={(e) => e.stopPropagation()}
       >
         <button
           onClick={onCancel}
           aria-label="Закрыть"
-          className="absolute right-3 top-3 rounded-full p-1 text-neutral-500 hover:text-white transition-colors"
+          className="absolute right-3 top-3 rounded-full p-1 text-neutral-500 hover:text-neutral-900 transition-colors dark:hover:text-white"
         >
           <X size={16} />
         </button>
@@ -70,8 +70,8 @@ export function ConfirmDialog({
             </div>
           )}
           <div>
-            <h3 className="text-base font-bold text-white">{title}</h3>
-            <p className="mt-1.5 text-sm text-neutral-400">{message}</p>
+            <h3 className="text-base font-bold text-neutral-900 dark:text-white">{title}</h3>
+            <p className="mt-1.5 text-sm text-neutral-600 dark:text-neutral-400">{message}</p>
           </div>
         </div>
 
@@ -79,7 +79,7 @@ export function ConfirmDialog({
           <button
             ref={cancelRef}
             onClick={onCancel}
-            className="rounded-lg px-4 py-2 text-sm font-medium text-neutral-300 hover:bg-white/[0.06] transition-colors cursor-pointer"
+            className="rounded-lg px-4 py-2 text-sm font-medium text-neutral-600 hover:bg-neutral-100 transition-colors cursor-pointer dark:text-neutral-300 dark:hover:bg-white/[0.06]"
           >
             {cancelLabel}
           </button>
diff --git a/src/app/admin/_components/FormField.tsx b/src/app/admin/_components/FormField.tsx
index 856d86b..7216559 100644
--- a/src/app/admin/_components/FormField.tsx
+++ b/src/app/admin/_components/FormField.tsx
@@ -12,10 +12,10 @@ interface InputFieldProps {
   type?: "text" | "url" | "tel";
 }
 
-const baseInput = "w-full rounded-lg border border-white/10 bg-neutral-800 px-4 py-2.5 text-white placeholder-neutral-500 outline-none hover:border-gold/30 focus:border-gold transition-colors";
+const baseInput = "w-full rounded-lg border border-neutral-200 bg-neutral-100 px-4 py-2.5 text-neutral-900 placeholder-neutral-400 outline-none hover:border-gold/30 focus:border-gold transition-colors dark:border-white/10 dark:bg-neutral-800 dark:text-white dark:placeholder-neutral-500";
 const textAreaInput = `${baseInput} resize-none overflow-hidden`;
-const smallInput = "rounded-md border border-white/10 bg-neutral-800 px-2.5 py-1.5 text-sm text-white placeholder-neutral-600 outline-none hover:border-gold/30 focus:border-gold transition-colors";
-const dashedInput = "flex-1 rounded-lg border border-dashed border-white/10 bg-neutral-800/50 px-4 py-2 text-sm text-white placeholder-neutral-600 outline-none hover:border-gold/30 hover:placeholder-neutral-500 focus:border-gold/50 transition-colors";
+const smallInput = "rounded-md border border-neutral-200 bg-neutral-100 px-2.5 py-1.5 text-sm text-neutral-900 placeholder-neutral-400 outline-none hover:border-gold/30 focus:border-gold transition-colors dark:border-white/10 dark:bg-neutral-800 dark:text-white dark:placeholder-neutral-600";
+const dashedInput = "flex-1 rounded-lg border border-dashed border-neutral-200 bg-neutral-100/50 px-4 py-2 text-sm text-neutral-900 placeholder-neutral-400 outline-none hover:border-gold/30 hover:placeholder-neutral-500 focus:border-gold/50 transition-colors dark:border-white/10 dark:bg-neutral-800/50 dark:text-white dark:placeholder-neutral-600";
 const inputCls = baseInput;
 
 export function InputField({
@@ -311,7 +311,7 @@ export function RichTextarea({
     `rounded p-1.5 transition-colors ${
       active
         ? "text-gold bg-gold/15"
-        : "text-neutral-500 hover:text-white hover:bg-white/10"
+        : "text-neutral-500 hover:text-neutral-900 hover:bg-neutral-200 dark:hover:text-white dark:hover:bg-white/10"
     }`;
 
   // Preview mode: show rendered markup
@@ -324,9 +324,9 @@ export function RichTextarea({
             setEditing(true);
             requestAnimationFrame(() => ref.current?.focus());
           }}
-          className="group rounded-lg border border-white/10 bg-neutral-800 px-4 py-2.5 cursor-text hover:border-gold/30 transition-colors relative"
+          className="group rounded-lg border border-neutral-200 bg-neutral-100 px-4 py-2.5 cursor-text hover:border-gold/30 transition-colors relative dark:border-white/10 dark:bg-neutral-800"
         >
-          <div className="text-sm leading-relaxed text-neutral-300">
+          <div className="text-sm leading-relaxed text-neutral-700 dark:text-neutral-300">
             {formatMarkup(value)}
           </div>
           <div className="absolute top-2 right-2 opacity-0 group-hover:opacity-100 transition-opacity">
@@ -343,9 +343,9 @@ export function RichTextarea({
   return (
     <div>
       <label className="block text-sm text-neutral-400 mb-1.5">{label}</label>
-      <div className="rounded-lg border border-white/10 bg-neutral-800 overflow-hidden hover:border-gold/30 focus-within:border-gold transition-colors">
+      <div className="rounded-lg border border-neutral-200 bg-neutral-100 overflow-hidden hover:border-gold/30 focus-within:border-gold transition-colors dark:border-white/10 dark:bg-neutral-800">
         {/* Toolbar */}
-        <div className="flex items-center gap-0.5 px-2 py-1 border-b border-white/5">
+        <div className="flex items-center gap-0.5 px-2 py-1 border-b border-neutral-200 dark:border-white/5">
           <button
             type="button"
             onMouseDown={(e) => e.preventDefault()}
@@ -396,7 +396,7 @@ export function RichTextarea({
           onBlur={() => setEditing(false)}
           placeholder={placeholder}
           rows={rows}
-          className="w-full bg-transparent px-4 py-2.5 text-white placeholder-neutral-500 outline-none resize-none"
+          className="w-full bg-transparent px-4 py-2.5 text-neutral-900 placeholder-neutral-400 outline-none resize-none dark:text-white dark:placeholder-neutral-500"
         />
       </div>
     </div>
@@ -480,8 +480,8 @@ export function SelectField({
           {label}
           {hint && (
             <span className="group relative">
-              <span className="flex h-4 w-4 items-center justify-center rounded-full border border-white/15 text-[10px] text-neutral-500 hover:text-white hover:border-white/30 transition-colors cursor-help">?</span>
-              <span className="absolute left-6 top-1/2 -translate-y-1/2 z-50 w-52 rounded-lg border border-white/10 bg-neutral-800 px-3 py-2 text-[11px] leading-relaxed text-neutral-300 shadow-xl opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto transition-opacity">
+              <span className="flex h-4 w-4 items-center justify-center rounded-full border border-neutral-300 text-[10px] text-neutral-500 hover:text-neutral-900 hover:border-neutral-400 transition-colors cursor-help dark:border-white/15 dark:hover:text-white dark:hover:border-white/30">?</span>
+              <span className="absolute left-6 top-1/2 -translate-y-1/2 z-50 w-52 rounded-lg border border-neutral-200 bg-white px-3 py-2 text-[11px] leading-relaxed text-neutral-700 shadow-xl opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto transition-opacity dark:border-white/10 dark:bg-neutral-800 dark:text-neutral-300">
                 {hint}
               </span>
             </span>
@@ -500,9 +500,9 @@ export function SelectField({
           aria-expanded={open}
           aria-haspopup="listbox"
           placeholder={placeholder || "Выберите..."}
-          className={`w-full rounded-lg border bg-neutral-800 outline-none transition-colors ${
+          className={`w-full rounded-lg border bg-neutral-100 text-neutral-900 outline-none transition-colors dark:bg-neutral-800 dark:text-white ${
             label ? "px-4 py-2.5" : "px-2 py-1 text-xs"
-          } ${open ? "border-gold" : "border-white/10"} ${!open && value ? "text-white" : "text-white"} placeholder-neutral-500`}
+          } ${open ? "border-gold" : "border-neutral-200 dark:border-white/10"} placeholder-neutral-400 dark:placeholder-neutral-500`}
         />
       ) : (
         <button
@@ -511,16 +511,16 @@ export function SelectField({
           onKeyDown={handleKeyDown}
           aria-expanded={open}
           aria-haspopup="listbox"
-          className={`w-full rounded-lg border bg-neutral-800 text-left outline-none transition-colors ${
+          className={`w-full rounded-lg border bg-neutral-100 text-left outline-none transition-colors dark:bg-neutral-800 ${
             label ? "px-4 py-2.5" : "px-2 py-1 text-xs"
-          } ${open ? "border-gold" : "border-white/10"} ${value ? "text-white" : "text-neutral-500"}`}
+          } ${open ? "border-gold" : "border-neutral-200 dark:border-white/10"} ${value ? "text-neutral-900 dark:text-white" : "text-neutral-500"}`}
         >
           {selectedLabel || placeholder || "Выберите..."}
         </button>
       )}
 
       {open && (
-        <div role="listbox" className="absolute z-50 mt-1 w-full rounded-lg border border-white/10 bg-neutral-800 shadow-xl overflow-hidden">
+        <div role="listbox" className="absolute z-50 mt-1 w-full rounded-lg border border-neutral-200 bg-white shadow-xl overflow-hidden dark:border-white/10 dark:bg-neutral-800">
           <div className="max-h-48 overflow-y-auto">
             {filtered.length === 0 && (
               <div className="px-4 py-2 text-sm text-neutral-500">Ничего не найдено</div>
@@ -541,8 +541,8 @@ export function SelectField({
                   inputRef.current?.blur();
                 }}
                 className={`w-full px-4 py-2 text-left text-sm transition-colors ${
-                  idx === highlightIndex ? "bg-white/10" : "hover:bg-white/5"
-                } ${opt.value === value ? "text-gold bg-gold/5" : "text-white"}`}
+                  idx === highlightIndex ? "bg-neutral-100 dark:bg-white/10" : "hover:bg-neutral-50 dark:hover:bg-white/5"
+                } ${opt.value === value ? "text-gold bg-gold/5" : "text-neutral-900 dark:text-white"}`}
               >
                 {opt.label}
               </button>
@@ -598,7 +598,7 @@ export function TimeRangeField({ label, value, onChange, onBlur }: TimeRangeFiel
           value={start}
           onChange={(e) => handleStartChange(e.target.value)}
           onBlur={onBlur}
-          className="flex-1 rounded-lg border border-white/10 bg-neutral-800 px-3 py-2.5 text-white outline-none focus:border-gold transition-colors"
+          className="flex-1 rounded-lg border border-neutral-200 bg-neutral-100 px-3 py-2.5 text-neutral-900 outline-none focus:border-gold transition-colors [color-scheme:light] dark:border-white/10 dark:bg-neutral-800 dark:text-white dark:[color-scheme:dark]"
         />
         <span className="text-neutral-500">–</span>
         <input
@@ -606,7 +606,7 @@ export function TimeRangeField({ label, value, onChange, onBlur }: TimeRangeFiel
           value={end}
           onChange={(e) => handleEndChange(e.target.value)}
           onBlur={onBlur}
-          className="flex-1 rounded-lg border border-white/10 bg-neutral-800 px-3 py-2.5 text-white outline-none focus:border-gold transition-colors"
+          className="flex-1 rounded-lg border border-neutral-200 bg-neutral-100 px-3 py-2.5 text-neutral-900 outline-none focus:border-gold transition-colors [color-scheme:light] dark:border-white/10 dark:bg-neutral-800 dark:text-white dark:[color-scheme:dark]"
         />
       </div>
     </div>
@@ -677,7 +677,7 @@ export function ListField({ label, items, onChange, placeholder }: ListFieldProp
               type="text"
               value={item}
               onChange={(e) => update(i, e.target.value)}
-              className="flex-1 rounded-lg border border-white/10 bg-neutral-800 px-4 py-2 text-sm text-white outline-none focus:border-gold transition-colors"
+              className="flex-1 rounded-lg border border-neutral-200 bg-neutral-100 px-4 py-2 text-sm text-neutral-900 outline-none focus:border-gold transition-colors dark:border-white/10 dark:bg-neutral-800 dark:text-white"
             />
             <button
               type="button"
@@ -778,13 +778,13 @@ export function VictoryListField({ label, items, onChange, placeholder, onLinkVa
       <label className="block text-sm text-neutral-400 mb-1.5">{label}</label>
       <div className="space-y-2">
         {items.map((item, i) => (
-          <div key={i} className="rounded-lg border border-white/10 bg-neutral-800/50 p-2.5 space-y-1.5 transition-colors hover:border-gold/30 hover:bg-neutral-800/80 focus-within:border-gold/50 focus-within:bg-neutral-800">
+          <div key={i} className="rounded-lg border border-neutral-200 bg-neutral-100/80 p-2.5 space-y-1.5 transition-colors hover:border-gold/30 hover:bg-neutral-200/80 focus-within:border-gold/50 focus-within:bg-neutral-200 dark:border-white/10 dark:bg-neutral-800/50 dark:hover:bg-neutral-800/80 dark:focus-within:bg-neutral-800">
             <div className="flex items-center gap-1.5">
               <input
                 type="text"
                 value={item.text}
                 onChange={(e) => updateText(i, e.target.value)}
-                className="flex-1 rounded-md border border-white/10 bg-neutral-800 px-2.5 py-1.5 text-sm text-white outline-none focus:border-gold transition-colors"
+                className="flex-1 rounded-md border border-neutral-200 bg-neutral-100 px-2.5 py-1.5 text-sm text-neutral-900 outline-none focus:border-gold transition-colors dark:border-white/10 dark:bg-neutral-800 dark:text-white"
               />
               <button
                 type="button"
@@ -796,7 +796,7 @@ export function VictoryListField({ label, items, onChange, placeholder, onLinkVa
             </div>
             <div className="flex items-center gap-1.5">
               {item.image ? (
-                <div className="flex items-center gap-1 rounded bg-neutral-700/50 px-1.5 py-0.5 text-[11px] text-neutral-300">
+                <div className="flex items-center gap-1 rounded bg-neutral-200 px-1.5 py-0.5 text-[11px] text-neutral-700 dark:bg-neutral-700/50 dark:text-neutral-300">
                   <ImageIcon size={10} className="text-gold" />
                   <span className="max-w-[80px] truncate">{item.image.split("/").pop()}</span>
                   <button type="button" onClick={() => removeImage(i)} className="text-neutral-500 hover:text-red-400">
@@ -886,8 +886,8 @@ export function ValidatedLinkField({ value, onChange, onValidate, validationKey,
             validate(e.target.value);
           }}
           placeholder={placeholder || "Ссылка..."}
-          className={`w-full rounded-md border bg-neutral-800 px-2 py-1 text-xs text-white placeholder-neutral-600 outline-none transition-colors ${
-            error ? "border-red-500/50" : "border-white/5 focus:border-gold/50"
+          className={`w-full rounded-md border bg-neutral-100 px-2 py-1 text-xs text-neutral-900 placeholder-neutral-400 outline-none transition-colors dark:bg-neutral-800 dark:text-white dark:placeholder-neutral-600 ${
+            error ? "border-red-500/50" : "border-neutral-200 focus:border-gold/50 dark:border-white/5"
           }`}
         />
         {error && (
@@ -965,8 +965,8 @@ export function AutocompleteMulti({
       <label className="block text-sm text-neutral-400 mb-1.5">{label}</label>
       <div
         onClick={() => { setOpen(true); inputRef.current?.focus(); }}
-        className={`flex flex-wrap items-center gap-1.5 rounded-lg border bg-neutral-800 px-3 py-2 min-h-[42px] cursor-text transition-colors ${
-          open ? "border-gold" : "border-white/10 hover:border-gold/30"
+        className={`flex flex-wrap items-center gap-1.5 rounded-lg border bg-neutral-100 px-3 py-2 min-h-[42px] cursor-text transition-colors dark:bg-neutral-800 ${
+          open ? "border-gold" : "border-neutral-200 hover:border-gold/30 dark:border-white/10"
         }`}
       >
         {selected.map((item) => (
@@ -985,14 +985,14 @@ export function AutocompleteMulti({
           onFocus={() => setOpen(true)}
           onKeyDown={handleKeyDown}
           placeholder={selected.length === 0 ? placeholder : ""}
-          className="flex-1 min-w-[80px] bg-transparent text-sm text-white placeholder-neutral-500 outline-none"
+          className="flex-1 min-w-[80px] bg-transparent text-sm text-neutral-900 placeholder-neutral-400 outline-none dark:text-white dark:placeholder-neutral-500"
         />
       </div>
       {open && filtered.length > 0 && (
-        <div className="absolute z-50 mt-1 w-full rounded-lg border border-white/10 bg-neutral-800 shadow-xl overflow-hidden max-h-48 overflow-y-auto">
+        <div className="absolute z-50 mt-1 w-full rounded-lg border border-neutral-200 bg-white shadow-xl overflow-hidden max-h-48 overflow-y-auto dark:border-white/10 dark:bg-neutral-800">
           {filtered.map((opt) => (
             <button key={opt} type="button" onMouseDown={(e) => e.preventDefault()} onClick={() => addItem(opt)}
-              className="w-full px-4 py-2 text-left text-sm text-white hover:bg-white/5 transition-colors">
+              className="w-full px-4 py-2 text-left text-sm text-neutral-900 hover:bg-neutral-50 transition-colors dark:text-white dark:hover:bg-white/5">
               {opt}
             </button>
           ))}
diff --git a/src/app/admin/_components/ImageCropField.tsx b/src/app/admin/_components/ImageCropField.tsx
index eb16c83..1ebb9bb 100644
--- a/src/app/admin/_components/ImageCropField.tsx
+++ b/src/app/admin/_components/ImageCropField.tsx
@@ -106,14 +106,14 @@ export function ImageCropField({
 
   return (
     <div>
-      <label className="block text-sm text-neutral-400 mb-1.5">
-        {label} <span className="text-neutral-600">(перетащите · Ctrl+колёсико для масштаба)</span>
+      <label className="block text-sm text-neutral-500 mb-1.5 dark:text-neutral-400">
+        {label} <span className="text-neutral-400 dark:text-neutral-600">(перетащите · Ctrl+колёсико для масштаба)</span>
       </label>
       {image ? (
         <div className={`${maxWidth} space-y-2`}>
           <div
             ref={containerRef}
-            className={`relative ${aspect} overflow-hidden rounded-lg border border-white/10 cursor-grab active:cursor-grabbing select-none`}
+            className={`relative ${aspect} overflow-hidden rounded-lg border border-neutral-200 cursor-grab active:cursor-grabbing select-none dark:border-white/10`}
             onPointerDown={handlePointerDown}
             onPointerMove={handlePointerMove}
             onPointerUp={handlePointerUp}
@@ -155,7 +155,7 @@ export function ImageCropField({
             )}
           </div>
           <div className="flex items-center gap-2">
-            <label className="flex cursor-pointer items-center gap-1.5 rounded-md border border-white/10 px-2.5 py-1 text-xs text-neutral-400 hover:text-white hover:border-white/25 transition-colors">
+            <label className="flex cursor-pointer items-center gap-1.5 rounded-md border border-neutral-200 px-2.5 py-1 text-xs text-neutral-500 hover:text-neutral-900 hover:border-neutral-300 transition-colors dark:border-white/10 dark:text-neutral-400 dark:hover:text-white dark:hover:border-white/25">
               {uploading ? <Loader2 size={12} className="animate-spin" /> : <Upload size={12} />}
               Заменить
               <input type="file" accept="image/*" onChange={handleUpload} className="hidden" />
@@ -170,7 +170,7 @@ export function ImageCropField({
           </div>
         </div>
       ) : (
-        <label className="inline-flex cursor-pointer items-center gap-2 rounded-lg border border-dashed border-white/15 px-4 py-2.5 text-neutral-500 hover:border-gold/30 hover:text-neutral-300 transition-colors">
+        <label className="inline-flex cursor-pointer items-center gap-2 rounded-lg border border-dashed border-neutral-300 px-4 py-2.5 text-neutral-500 hover:border-gold/30 hover:text-neutral-700 transition-colors dark:border-white/15 dark:hover:text-neutral-300">
           {uploading ? <Loader2 size={14} className="animate-spin" /> : <ImageIcon size={14} />}
           <span className="text-xs">{uploading ? "Загрузка..." : "Загрузить фото"}</span>
           <input type="file" accept="image/*" onChange={handleUpload} className="hidden" />
diff --git a/src/app/admin/_components/PriceField.tsx b/src/app/admin/_components/PriceField.tsx
index 460e506..4a1fab8 100644
--- a/src/app/admin/_components/PriceField.tsx
+++ b/src/app/admin/_components/PriceField.tsx
@@ -12,8 +12,8 @@ export function PriceField({ label, value, onChange, placeholder = "0" }: PriceF
 
   return (
     <div>
-      <label className="block text-sm text-neutral-400 mb-1.5">{label}</label>
-      <div className="flex rounded-lg border border-white/10 bg-neutral-800 focus-within:border-gold transition-colors">
+      <label className="block text-sm text-neutral-500 mb-1.5 dark:text-neutral-400">{label}</label>
+      <div className="flex rounded-lg border border-neutral-200 bg-neutral-100 focus-within:border-gold transition-colors dark:border-white/10 dark:bg-neutral-800">
         <input
           type="text"
           inputMode="decimal"
@@ -23,7 +23,7 @@ export function PriceField({ label, value, onChange, placeholder = "0" }: PriceF
             onChange(v ? `${v} BYN` : "");
           }}
           placeholder={placeholder}
-          className="flex-1 bg-transparent px-4 py-2.5 text-white placeholder-neutral-500 outline-none min-w-0"
+          className="flex-1 bg-transparent px-4 py-2.5 text-neutral-900 placeholder-neutral-400 outline-none min-w-0 dark:text-white dark:placeholder-neutral-500"
         />
         <span className="flex items-center pr-4 text-sm font-medium text-gold select-none">
           BYN
diff --git a/src/app/admin/about/page.tsx b/src/app/admin/about/page.tsx
index b48695d..2191074 100644
--- a/src/app/admin/about/page.tsx
+++ b/src/app/admin/about/page.tsx
@@ -29,7 +29,7 @@ export default function AboutEditorPage() {
                 value={text}
                 onChange={(e) => updateItem(e.target.value)}
                 rows={2}
-                className="w-full rounded-lg border border-white/10 bg-neutral-800 px-3 py-2 text-sm text-white placeholder-neutral-500 outline-none hover:border-gold/30 focus:border-gold transition-colors resize-none"
+                className="w-full rounded-lg border border-neutral-200 bg-neutral-100 px-3 py-2 text-sm text-neutral-900 placeholder-neutral-400 outline-none hover:border-gold/30 focus:border-gold transition-colors resize-none dark:border-white/10 dark:bg-neutral-800 dark:text-white dark:placeholder-neutral-500"
                 placeholder="Текст параграфа..."
               />
             )}
diff --git a/src/app/admin/bookings/AddBookingModal.tsx b/src/app/admin/bookings/AddBookingModal.tsx
index fa586a7..5767c22 100644
--- a/src/app/admin/bookings/AddBookingModal.tsx
+++ b/src/app/admin/bookings/AddBookingModal.tsx
@@ -65,7 +65,7 @@ function SearchSelect({ options, value, onChange, placeholder }: {
       <div
         onClick={() => { setOpen(true); setTimeout(() => inputRef.current?.focus(), 0); }}
         className={`flex items-center gap-2 w-full rounded-lg border px-3 py-2 text-sm cursor-text transition-colors ${
-          open ? "border-gold/40 bg-white/[0.06]" : "border-white/[0.08] bg-white/[0.04]"
+          open ? "border-gold/40 bg-neutral-200/60 dark:bg-white/[0.06]" : "border-neutral-200 bg-neutral-100 dark:border-white/[0.08] dark:bg-white/[0.04]"
         }`}
       >
         {open ? (
@@ -75,14 +75,14 @@ function SearchSelect({ options, value, onChange, placeholder }: {
             value={search}
             onChange={(e) => setSearch(e.target.value)}
             placeholder={selected ? selected.label : placeholder}
-            className="flex-1 bg-transparent text-white placeholder-neutral-500 outline-none text-sm"
+            className="flex-1 bg-transparent text-neutral-900 placeholder-neutral-400 outline-none text-sm dark:text-white dark:placeholder-neutral-500"
             onKeyDown={(e) => {
               if (e.key === "Escape") { setOpen(false); setSearch(""); }
               if (e.key === "Backspace" && !search && value) { onChange(""); }
             }}
           />
         ) : (
-          <span className={`flex-1 truncate ${selected ? "text-white" : "text-neutral-500"}`}>
+          <span className={`flex-1 truncate ${selected ? "text-neutral-900 dark:text-white" : "text-neutral-500"}`}>
             {selected ? selected.label : placeholder}
           </span>
         )}
@@ -100,7 +100,7 @@ function SearchSelect({ options, value, onChange, placeholder }: {
       </div>
 
       {open && (
-        <div className="absolute z-20 mt-1 w-full rounded-lg border border-white/[0.08] shadow-xl overflow-hidden" style={{ backgroundColor: "#141414" }}>
+        <div className="absolute z-20 mt-1 w-full rounded-lg border border-neutral-200 bg-white shadow-xl overflow-hidden dark:border-white/[0.08] dark:bg-[#141414]">
           <div className="max-h-48 overflow-y-scroll admin-scrollbar">
             {filtered.length === 0 && (
               <p className="px-3 py-2 text-xs text-neutral-500">Ничего не найдено</p>
@@ -112,7 +112,7 @@ function SearchSelect({ options, value, onChange, placeholder }: {
                 onMouseDown={(e) => e.preventDefault()}
                 onClick={() => { onChange(o.value); setOpen(false); setSearch(""); }}
                 className={`w-full px-3 py-2 text-left text-sm transition-colors ${
-                  o.value === value ? "bg-gold/10 text-gold" : "text-white hover:bg-white/[0.05]"
+                  o.value === value ? "bg-gold/10 text-gold" : "text-neutral-900 hover:bg-neutral-50 dark:text-white dark:hover:bg-white/[0.05]"
                 }`}
               >
                 {o.label}
@@ -288,7 +288,7 @@ export function AddBookingModal({
 
   if (!open) return null;
 
-  const inputClass = "w-full rounded-lg border border-white/[0.08] bg-white/[0.04] px-3 py-2 text-sm text-white outline-none focus:border-gold/40 placeholder-neutral-500";
+  const inputClass = "w-full rounded-lg border border-neutral-200 bg-neutral-100 px-3 py-2 text-sm text-neutral-900 outline-none focus:border-gold/40 placeholder-neutral-400 dark:border-white/[0.08] dark:bg-white/[0.04] dark:text-white dark:placeholder-neutral-500";
 
   const canSubmit = name.trim() && phone.trim() && !saving
     && (tab === "classes" || (tab === "events" && eventType === "master-class" && hasUpcomingMc)
@@ -297,21 +297,21 @@ export function AddBookingModal({
   return createPortal(
     <div className="fixed inset-0 z-50 flex items-center justify-center p-4" onClick={onClose}>
       <div className="absolute inset-0 bg-black/70 backdrop-blur-sm" />
-      <div className="relative w-full max-w-sm rounded-2xl border border-white/[0.08] bg-[#0a0a0a] p-6 shadow-2xl" onClick={(e) => e.stopPropagation()}>
-        <button onClick={onClose} className="absolute right-3 top-3 flex h-7 w-7 items-center justify-center rounded-full text-neutral-500 hover:bg-white/[0.06] hover:text-white">
+      <div className="relative w-full max-w-sm rounded-2xl border border-neutral-200 bg-white p-6 shadow-2xl dark:border-white/[0.08] dark:bg-[#0a0a0a]" onClick={(e) => e.stopPropagation()}>
+        <button onClick={onClose} className="absolute right-3 top-3 flex h-7 w-7 items-center justify-center rounded-full text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900 dark:hover:bg-white/[0.06] dark:hover:text-white">
           <X size={16} />
         </button>
 
-        <h3 className="text-base font-bold text-white">Добавить запись</h3>
-        <p className="mt-1 text-xs text-neutral-400">Ручная запись (Instagram, звонок, лично)</p>
+        <h3 className="text-base font-bold text-neutral-900 dark:text-white">Добавить запись</h3>
+        <p className="mt-1 text-xs text-neutral-500 dark:text-neutral-400">Ручная запись (Instagram, звонок, лично)</p>
 
         <div className="mt-4 space-y-3">
           {/* Type selector — single row */}
-          <div className="flex rounded-lg border border-white/[0.08] bg-white/[0.03] p-0.5">
+          <div className="flex rounded-lg border border-neutral-200 bg-neutral-100 p-0.5 dark:border-white/[0.08] dark:bg-white/[0.03]">
             <button
               onClick={() => setTab("classes")}
               className={`flex-1 rounded-md py-2 text-xs font-medium transition-all ${
-                tab === "classes" ? "bg-gold/20 text-gold shadow-sm" : "text-neutral-400 hover:text-white"
+                tab === "classes" ? "bg-gold/20 text-gold shadow-sm" : "text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white"
               }`}
             >
               Занятие
@@ -320,7 +320,7 @@ export function AddBookingModal({
               <button
                 onClick={() => { setTab("events"); setEventType("master-class"); }}
                 className={`flex-1 rounded-md py-2 text-xs font-medium transition-all ${
-                  tab === "events" && eventType === "master-class" ? "bg-purple-500/15 text-purple-400 shadow-sm" : "text-neutral-400 hover:text-white"
+                  tab === "events" && eventType === "master-class" ? "bg-purple-500/15 text-purple-400 shadow-sm" : "text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white"
                 }`}
               >
                 Мастер-класс
@@ -330,7 +330,7 @@ export function AddBookingModal({
               <button
                 onClick={() => { setTab("events"); setEventType("open-day"); }}
                 className={`flex-1 rounded-md py-2 text-xs font-medium transition-all ${
-                  tab === "events" && eventType === "open-day" ? "bg-blue-500/15 text-blue-400 shadow-sm" : "text-neutral-400 hover:text-white"
+                  tab === "events" && eventType === "open-day" ? "bg-blue-500/15 text-blue-400 shadow-sm" : "text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white"
                 }`}
               >
                 Open Day
diff --git a/src/app/admin/bookings/SearchBar.tsx b/src/app/admin/bookings/SearchBar.tsx
index ad72a12..ff6b45e 100644
--- a/src/app/admin/bookings/SearchBar.tsx
+++ b/src/app/admin/bookings/SearchBar.tsx
@@ -43,10 +43,10 @@ export function SearchBar({
         value={query}
         onChange={(e) => handleChange(e.target.value)}
         placeholder="Поиск по имени или телефону..."
-        className="w-full rounded-lg border border-white/[0.08] bg-white/[0.04] py-2 pl-9 pr-8 text-sm text-white placeholder-neutral-500 outline-none focus:border-gold/40"
+        className="w-full rounded-lg border border-neutral-200 bg-neutral-100 py-2 pl-9 pr-8 text-sm text-neutral-900 placeholder-neutral-400 outline-none focus:border-gold/40 dark:border-white/[0.08] dark:bg-white/[0.04] dark:text-white dark:placeholder-neutral-500"
       />
       {query && (
-        <button onClick={clear} className="absolute right-2 top-1/2 -translate-y-1/2 text-neutral-500 hover:text-white">
+        <button onClick={clear} className="absolute right-2 top-1/2 -translate-y-1/2 text-neutral-500 hover:text-neutral-900 dark:hover:text-white">
           <X size={14} />
         </button>
       )}
diff --git a/src/app/admin/classes/page.tsx b/src/app/admin/classes/page.tsx
index c5ba78c..5c8e753 100644
--- a/src/app/admin/classes/page.tsx
+++ b/src/app/admin/classes/page.tsx
@@ -109,8 +109,8 @@ function IconPicker({
           setSearch("");
           setTimeout(() => inputRef.current?.focus(), 0);
         }}
-        className={`w-full flex items-center gap-2.5 rounded-lg border bg-neutral-800 px-4 py-2.5 text-left text-white outline-none transition-colors ${
-          open ? "border-gold" : "border-white/10"
+        className={`w-full flex items-center gap-2.5 rounded-lg border bg-neutral-100 px-4 py-2.5 text-left text-neutral-900 outline-none transition-colors dark:bg-neutral-800 dark:text-white ${
+          open ? "border-gold" : "border-neutral-200 dark:border-white/10"
         }`}
       >
         {SelectedIcon ? (
@@ -118,13 +118,13 @@ function IconPicker({
             <SelectedIcon size={16} />
           </span>
         ) : (
-          <span className="flex h-6 w-6 items-center justify-center rounded-md bg-white/10 text-neutral-500">?</span>
+          <span className="flex h-6 w-6 items-center justify-center rounded-md bg-neutral-200 text-neutral-500 dark:bg-white/10">?</span>
         )}
         <span className="text-sm">{selected?.label || value}</span>
       </button>
 
       {open && (
-        <div className="absolute z-50 mt-1 w-full rounded-lg border border-white/10 bg-neutral-800 shadow-xl overflow-hidden">
+        <div className="absolute z-50 mt-1 w-full rounded-lg border border-neutral-200 bg-white shadow-xl overflow-hidden dark:border-white/10 dark:bg-neutral-800">
           <div className="p-2 pb-0">
             <input
               ref={inputRef}
@@ -132,7 +132,7 @@ function IconPicker({
               value={search}
               onChange={(e) => setSearch(e.target.value)}
               placeholder="Поиск..."
-              className="w-full rounded-md border border-white/10 bg-neutral-900 px-3 py-1.5 text-sm text-white outline-none focus:border-gold/50 placeholder:text-neutral-600"
+              className="w-full rounded-md border border-neutral-200 bg-neutral-100 px-3 py-1.5 text-sm text-neutral-900 outline-none focus:border-gold/50 placeholder:text-neutral-400 dark:border-white/10 dark:bg-neutral-900 dark:text-white dark:placeholder:text-neutral-600"
             />
           </div>
           <div className="p-2 max-h-56 overflow-y-auto">
@@ -153,7 +153,7 @@ function IconPicker({
                     className={`flex flex-col items-center gap-0.5 rounded-lg p-2 transition-colors ${
                       key === value
                         ? "bg-gold/20 text-gold-light"
-                        : "text-neutral-400 hover:bg-white/5 hover:text-white"
+                        : "text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900 dark:text-neutral-400 dark:hover:bg-white/5 dark:hover:text-white"
                     }`}
                   >
                     <Icon size={20} />
diff --git a/src/app/admin/contact/page.tsx b/src/app/admin/contact/page.tsx
index 5efe77d..85d5894 100644
--- a/src/app/admin/contact/page.tsx
+++ b/src/app/admin/contact/page.tsx
@@ -41,8 +41,8 @@ function PhoneField({ value, onChange }: { value: string; onChange: (v: string)
           value={value ?? ""}
           onChange={handleChange}
           placeholder="+375 (XX) XXX-XX-XX"
-          className={`w-full rounded-lg border bg-neutral-800 px-4 py-2.5 text-white placeholder-neutral-500 outline-none transition-colors ${
-            value && !isComplete ? "border-red-500/50" : "border-white/10 focus:border-gold"
+          className={`w-full rounded-lg border bg-neutral-100 px-4 py-2.5 text-neutral-900 placeholder-neutral-400 outline-none transition-colors dark:bg-neutral-800 dark:text-white dark:placeholder-neutral-500 ${
+            value && !isComplete ? "border-red-500/50" : "border-neutral-200 focus:border-gold dark:border-white/10"
           }`}
         />
         {isComplete && (
@@ -106,12 +106,12 @@ function InstagramField({ value, onChange }: { value: string; onChange: (v: stri
             validateUsername(username);
           }}
           placeholder="blackheartdancehouse"
-          className={`w-full rounded-lg border bg-neutral-800 pl-8 pr-10 py-2.5 text-white placeholder-neutral-500 outline-none hover:border-gold/30 transition-colors ${
+          className={`w-full rounded-lg border bg-neutral-100 pl-8 pr-10 py-2.5 text-neutral-900 placeholder-neutral-400 outline-none hover:border-gold/30 transition-colors dark:bg-neutral-800 dark:text-white dark:placeholder-neutral-500 ${
             status === "invalid"
               ? "border-red-500 focus:border-red-500"
               : status === "valid"
               ? "border-green-500/50 focus:border-green-500"
-              : "border-white/10 focus:border-gold"
+              : "border-neutral-200 focus:border-gold dark:border-white/10"
           }`}
         />
         <span className="absolute right-3 top-1/2 -translate-y-1/2">
@@ -164,7 +164,7 @@ function AddressList({ items, onChange }: { items: string[]; onChange: (items: s
             type="text"
             value={addr}
             onChange={(e) => update(i, e.target.value)}
-            className="flex-1 rounded-lg border border-white/10 bg-neutral-800 px-4 py-2.5 text-sm text-white outline-none focus:border-gold transition-colors"
+            className="flex-1 rounded-lg border border-neutral-200 bg-neutral-100 px-4 py-2.5 text-sm text-neutral-900 outline-none focus:border-gold transition-colors dark:border-white/10 dark:bg-neutral-800 dark:text-white"
           />
           <button
             type="button"
@@ -183,7 +183,7 @@ function AddressList({ items, onChange }: { items: string[]; onChange: (items: s
           onKeyDown={(e) => { if (e.key === "Enter") { e.preventDefault(); add(); } }}
           onBlur={add}
           placeholder="Добавить адрес..."
-          className="flex-1 rounded-lg border border-dashed border-white/15 bg-neutral-800/50 px-4 py-2.5 text-sm text-white placeholder-neutral-500 outline-none focus:border-gold/50 transition-colors"
+          className="flex-1 rounded-lg border border-dashed border-neutral-300 bg-neutral-100/50 px-4 py-2.5 text-sm text-neutral-900 placeholder-neutral-400 outline-none focus:border-gold/50 transition-colors dark:border-white/15 dark:bg-neutral-800/50 dark:text-white dark:placeholder-neutral-500"
         />
         <button
           type="button"
diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx
index 1e9fd7f..6150c17 100644
--- a/src/app/admin/layout.tsx
+++ b/src/app/admin/layout.tsx
@@ -4,6 +4,7 @@ import { useState, useEffect } from "react";
 import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
 import { adminFetch } from "@/lib/csrf";
+import { ThemeToggle } from "@/components/ui/ThemeToggle";
 import {
   LayoutDashboard,
   Sparkles,
@@ -88,7 +89,7 @@ export default function AdminLayout({
   }
 
   return (
-    <div className="flex min-h-screen bg-neutral-950 text-white">
+    <div className="flex min-h-screen bg-neutral-50 text-neutral-900 dark:bg-neutral-950 dark:text-white">
       {/* Mobile overlay */}
       {sidebarOpen && (
         <div
@@ -99,18 +100,18 @@ export default function AdminLayout({
 
       {/* Sidebar */}
       <aside
-        className={`fixed inset-y-0 left-0 z-50 flex w-64 flex-col border-r border-white/10 bg-neutral-900 transition-transform lg:sticky lg:top-0 lg:h-screen lg:translate-x-0 ${
+        className={`fixed inset-y-0 left-0 z-50 flex w-64 flex-col border-r border-neutral-200 bg-white dark:border-white/10 dark:bg-neutral-900 transition-transform lg:sticky lg:top-0 lg:h-screen lg:translate-x-0 ${
           sidebarOpen ? "translate-x-0" : "-translate-x-full"
         }`}
       >
-        <div className="flex items-center justify-between border-b border-white/10 px-5 py-4">
+        <div className="flex items-center justify-between border-b border-neutral-200 dark:border-white/10 px-5 py-4">
           <Link href="/admin" className="text-lg font-bold">
             BLACK HEART
           </Link>
           <button
             onClick={() => setSidebarOpen(false)}
             aria-label="Закрыть меню"
-            className="lg:hidden text-neutral-400 hover:text-white"
+            className="lg:hidden text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white"
           >
             <X size={20} />
           </button>
@@ -128,7 +129,7 @@ export default function AdminLayout({
                 className={`flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm transition-colors ${
                   active
                     ? "bg-gold/10 text-gold font-medium"
-                    : "text-neutral-400 hover:text-white hover:bg-white/5"
+                    : "text-neutral-500 hover:text-neutral-900 hover:bg-neutral-100 dark:text-neutral-400 dark:hover:text-white dark:hover:bg-white/5"
                 }`}
               >
                 <Icon size={18} />
@@ -143,18 +144,22 @@ export default function AdminLayout({
           })}
         </nav>
 
-        <div className="border-t border-white/10 p-3 space-y-1">
+        <div className="border-t border-neutral-200 dark:border-white/10 p-3 space-y-1">
+          <div className="flex items-center justify-between px-3 py-1">
+            <span className="text-xs text-neutral-400 dark:text-neutral-500">Тема</span>
+            <ThemeToggle />
+          </div>
           <Link
             href="/"
             target="_blank"
-            className="flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm text-neutral-400 hover:text-white hover:bg-white/5 transition-colors"
+            className="flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm text-neutral-500 hover:text-neutral-900 hover:bg-neutral-100 dark:text-neutral-400 dark:hover:text-white dark:hover:bg-white/5 transition-colors"
           >
             <ChevronLeft size={18} />
             Открыть сайт
           </Link>
           <button
             onClick={handleLogout}
-            className="flex w-full items-center gap-3 rounded-lg px-3 py-2.5 text-sm text-neutral-400 hover:text-red-400 hover:bg-white/5 transition-colors"
+            className="flex w-full items-center gap-3 rounded-lg px-3 py-2.5 text-sm text-neutral-500 hover:text-red-500 hover:bg-neutral-100 dark:text-neutral-400 dark:hover:text-red-400 dark:hover:bg-white/5 transition-colors"
           >
             <LogOut size={18} />
             Выйти
@@ -165,16 +170,17 @@ export default function AdminLayout({
       {/* Main content */}
       <div className="flex-1 flex flex-col min-w-0">
         {/* Top bar (mobile) */}
-        <header className="sticky top-0 z-30 flex items-center gap-3 border-b border-white/10 bg-neutral-950 px-4 py-3 lg:hidden">
+        <header className="sticky top-0 z-30 flex items-center gap-3 border-b border-neutral-200 bg-white dark:border-white/10 dark:bg-neutral-950 px-4 py-3 lg:hidden">
           <button
             onClick={() => setSidebarOpen(true)}
             aria-label="Открыть меню"
             aria-expanded={sidebarOpen}
-            className="text-neutral-400 hover:text-white"
+            className="text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white"
           >
             <Menu size={24} />
           </button>
-          <a href="/admin" className="font-bold hover:text-gold transition-colors">BLACK HEART</a>
+          <a href="/admin" className="font-bold hover:text-gold transition-colors flex-1">BLACK HEART</a>
+          <ThemeToggle />
         </header>
 
         <main className="flex-1 p-4 sm:p-6 lg:p-8">{children}</main>
diff --git a/src/app/admin/login/page.tsx b/src/app/admin/login/page.tsx
index 059c60e..661058b 100644
--- a/src/app/admin/login/page.tsx
+++ b/src/app/admin/login/page.tsx
@@ -36,18 +36,18 @@ export default function AdminLoginPage() {
   }
 
   return (
-    <div className="flex min-h-screen items-center justify-center bg-neutral-950 px-4">
+    <div className="flex min-h-screen items-center justify-center bg-neutral-50 px-4 dark:bg-neutral-950">
       <form
         onSubmit={handleSubmit}
-        className="w-full max-w-sm space-y-6 rounded-2xl border border-white/10 bg-neutral-900 p-8"
+        className="w-full max-w-sm space-y-6 rounded-2xl border border-neutral-200 bg-white p-8 dark:border-white/10 dark:bg-neutral-900"
       >
         <div className="text-center">
-          <h1 className="text-2xl font-bold text-white">BLACK HEART</h1>
-          <p className="mt-1 text-sm text-neutral-400">Панель управления</p>
+          <h1 className="text-2xl font-bold text-neutral-900 dark:text-white">BLACK HEART</h1>
+          <p className="mt-1 text-sm text-neutral-500 dark:text-neutral-400">Панель управления</p>
         </div>
 
         <div>
-          <label htmlFor="password" className="block text-sm text-neutral-400 mb-2">
+          <label htmlFor="password" className="block text-sm text-neutral-500 mb-2 dark:text-neutral-400">
             Пароль
           </label>
           <div className="relative">
@@ -56,7 +56,7 @@ export default function AdminLoginPage() {
               type={showPassword ? "text" : "password"}
               value={password}
               onChange={(e) => setPassword(e.target.value)}
-              className="w-full rounded-lg border border-white/10 bg-neutral-800 px-4 py-3 pr-11 text-white placeholder-neutral-500 outline-none focus:border-gold transition-colors"
+              className="w-full rounded-lg border border-neutral-200 bg-neutral-100 px-4 py-3 pr-11 text-neutral-900 placeholder-neutral-400 outline-none focus:border-gold transition-colors dark:border-white/10 dark:bg-neutral-800 dark:text-white dark:placeholder-neutral-500"
               placeholder="Введите пароль"
               autoFocus
               aria-describedby={error ? "login-error" : undefined}
@@ -65,7 +65,7 @@ export default function AdminLoginPage() {
               type="button"
               onClick={() => setShowPassword(!showPassword)}
               aria-label={showPassword ? "Скрыть пароль" : "Показать пароль"}
-              className="absolute right-3 top-1/2 -translate-y-1/2 text-neutral-500 hover:text-white transition-colors"
+              className="absolute right-3 top-1/2 -translate-y-1/2 text-neutral-500 hover:text-neutral-900 transition-colors dark:hover:text-white"
               tabIndex={-1}
             >
               {showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
diff --git a/src/app/admin/master-classes/page.tsx b/src/app/admin/master-classes/page.tsx
index cd322aa..a82d59f 100644
--- a/src/app/admin/master-classes/page.tsx
+++ b/src/app/admin/master-classes/page.tsx
@@ -68,7 +68,7 @@ function LocationSelect({
               className={`rounded-full px-3 py-1.5 text-xs font-medium transition-all ${
                 active
                   ? "bg-gold/20 text-gold border border-gold/40"
-                  : "bg-neutral-800 text-neutral-400 border border-white/10 hover:border-white/25 hover:text-white"
+                  : "bg-neutral-100 text-neutral-500 border border-neutral-200 hover:border-neutral-300 hover:text-neutral-900 dark:bg-neutral-800 dark:text-neutral-400 dark:border-white/10 dark:hover:border-white/25 dark:hover:text-white"
               }`}
             >
               {active && <Check size={10} className="inline mr-1" />}
@@ -144,16 +144,16 @@ function SlotsField({
                   type="date"
                   value={slot.date}
                   onChange={(e) => updateSlot(i, { date: e.target.value })}
-                  className={`w-[140px] rounded-lg border bg-neutral-800 px-3 py-2 text-sm text-white outline-none transition-colors [color-scheme:dark] ${
-                    !slot.date ? "border-red-500/50" : "border-white/10 focus:border-gold"
+                  className={`w-[140px] rounded-lg border bg-neutral-100 px-3 py-2 text-sm text-neutral-900 outline-none transition-colors [color-scheme:light] dark:bg-neutral-800 dark:text-white dark:[color-scheme:dark] ${
+                    !slot.date ? "border-red-500/50" : "border-neutral-200 focus:border-gold dark:border-white/10"
                   }`}
                 />
                 <input
                   type="time"
                   value={slot.startTime}
                   onChange={(e) => updateSlot(i, { startTime: e.target.value })}
-                  className={`w-[100px] rounded-lg border bg-neutral-800 px-3 py-2 text-sm text-white outline-none transition-colors [color-scheme:dark] ${
-                    timeError ? "border-red-500/50" : "border-white/10 focus:border-gold"
+                  className={`w-[100px] rounded-lg border bg-neutral-100 px-3 py-2 text-sm text-neutral-900 outline-none transition-colors [color-scheme:light] dark:bg-neutral-800 dark:text-white dark:[color-scheme:dark] ${
+                    timeError ? "border-red-500/50" : "border-neutral-200 focus:border-gold dark:border-white/10"
                   }`}
                 />
                 <span className="text-neutral-500 text-xs">&ndash;</span>
@@ -161,12 +161,12 @@ function SlotsField({
                   type="time"
                   value={slot.endTime}
                   onChange={(e) => updateSlot(i, { endTime: e.target.value })}
-                  className={`w-[100px] rounded-lg border bg-neutral-800 px-3 py-2 text-sm text-white outline-none transition-colors [color-scheme:dark] ${
-                    timeError ? "border-red-500/50" : "border-white/10 focus:border-gold"
+                  className={`w-[100px] rounded-lg border bg-neutral-100 px-3 py-2 text-sm text-neutral-900 outline-none transition-colors [color-scheme:light] dark:bg-neutral-800 dark:text-white dark:[color-scheme:dark] ${
+                    timeError ? "border-red-500/50" : "border-neutral-200 focus:border-gold dark:border-white/10"
                   }`}
                 />
                 {dur && (
-                  <span className="text-[11px] text-neutral-500 bg-neutral-800/50 rounded-full px-2 py-0.5">
+                  <span className="text-[11px] text-neutral-500 bg-neutral-200/50 rounded-full px-2 py-0.5 dark:bg-neutral-800/50">
                     {dur}
                   </span>
                 )}
@@ -190,7 +190,7 @@ function SlotsField({
         <button
           type="button"
           onClick={addSlot}
-          className="flex items-center gap-2 rounded-lg border border-dashed border-white/10 bg-neutral-800/50 px-3 py-1.5 text-xs text-neutral-500 hover:text-gold hover:border-gold/30 transition-colors"
+          className="flex items-center gap-2 rounded-lg border border-dashed border-neutral-200 bg-neutral-100/50 px-3 py-1.5 text-xs text-neutral-500 hover:text-gold hover:border-gold/30 transition-colors dark:border-white/10 dark:bg-neutral-800/50"
         >
           <Plus size={12} />
           Добавить дату
@@ -223,8 +223,8 @@ function InstagramLinkField({
           value={value}
           onChange={(e) => onChange(e.target.value)}
           placeholder="https://instagram.com/p/... или /reel/..."
-          className={`w-full rounded-lg border bg-neutral-800 px-4 py-2.5 text-white placeholder-neutral-500 outline-none transition-colors ${
-            error ? "border-red-500/50" : "border-white/10 focus:border-gold"
+          className={`w-full rounded-lg border bg-neutral-100 px-4 py-2.5 text-neutral-900 placeholder-neutral-400 outline-none transition-colors dark:bg-neutral-800 dark:text-white dark:placeholder-neutral-500 ${
+            error ? "border-red-500/50" : "border-neutral-200 focus:border-gold dark:border-white/10"
           }`}
         />
         {value && !error && (
@@ -318,13 +318,13 @@ function FilterBar({
           value={search}
           onChange={(e) => onSearchChange(e.target.value)}
           placeholder="Поиск по названию или тренеру..."
-          className="w-full rounded-lg border border-white/10 bg-neutral-800 pl-10 pr-4 py-2.5 text-sm text-white placeholder-neutral-500 outline-none focus:border-gold transition-colors"
+          className="w-full rounded-lg border border-neutral-200 bg-neutral-100 pl-10 pr-4 py-2.5 text-sm text-neutral-900 placeholder-neutral-400 outline-none focus:border-gold transition-colors dark:border-white/10 dark:bg-neutral-800 dark:text-white dark:placeholder-neutral-500"
         />
         {search && (
           <button
             type="button"
             onClick={() => onSearchChange("")}
-            className="absolute right-3 top-1/2 -translate-y-1/2 text-neutral-500 hover:text-white transition-colors"
+            className="absolute right-3 top-1/2 -translate-y-1/2 text-neutral-500 hover:text-neutral-900 transition-colors dark:hover:text-white"
           >
             <X size={14} />
           </button>
@@ -340,7 +340,7 @@ function FilterBar({
               className={`rounded-full px-3 py-1 text-xs font-medium transition-all ${
                 dateFilter === key
                   ? "bg-gold/20 text-gold border border-gold/40"
-                  : "bg-neutral-800 text-neutral-400 border border-white/10 hover:border-white/25 hover:text-white"
+                  : "bg-neutral-100 text-neutral-500 border border-neutral-200 hover:border-neutral-300 hover:text-neutral-900 dark:bg-neutral-800 dark:text-neutral-400 dark:border-white/10 dark:hover:border-white/25 dark:hover:text-white"
               }`}
             >
               {DATE_FILTER_LABELS[key]}
@@ -359,7 +359,7 @@ function FilterBar({
                   className={`rounded-full px-3 py-1 text-xs font-medium transition-all ${
                     locationFilter === loc.name
                       ? "bg-gold/20 text-gold border border-gold/40"
-                      : "bg-neutral-800 text-neutral-400 border border-white/10 hover:border-white/25 hover:text-white"
+                      : "bg-neutral-100 text-neutral-500 border border-neutral-200 hover:border-neutral-300 hover:text-neutral-900 dark:bg-neutral-800 dark:text-neutral-400 dark:border-white/10 dark:hover:border-white/25 dark:hover:text-white"
                   }`}
                 >
                   {loc.name}
diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
index 9b098b3..ccf1609 100644
--- a/src/app/admin/page.tsx
+++ b/src/app/admin/page.tsx
@@ -63,13 +63,13 @@ function UnreadWidget({ counts }: { counts: UnreadCounts }) {
           <UserPlus size={20} />
         </div>
         <div>
-          <h2 className="font-medium text-white">
+          <h2 className="font-medium text-neutral-900 dark:text-white">
             Новые записи
             <span className="ml-2 inline-flex items-center justify-center rounded-full bg-red-500 text-white text-[11px] font-bold min-w-[20px] h-[20px] px-1.5">
               {counts.total}
             </span>
           </h2>
-          <p className="text-xs text-neutral-400">Не подтверждённые заявки</p>
+          <p className="text-xs text-neutral-500 dark:text-neutral-400">Не подтверждённые заявки</p>
         </div>
       </div>
       <div className="flex gap-3">
@@ -78,7 +78,7 @@ function UnreadWidget({ counts }: { counts: UnreadCounts }) {
             <span className="rounded-full bg-gold/15 text-gold font-medium px-2 py-0.5">
               {item.count}
             </span>
-            <span className="text-neutral-400">{item.label}</span>
+            <span className="text-neutral-500 dark:text-neutral-400">{item.label}</span>
           </div>
         ))}
       </div>
@@ -99,7 +99,7 @@ export default function AdminDashboard() {
   return (
     <div>
       <h1 className="text-2xl font-bold">Панель управления</h1>
-      <p className="mt-1 text-neutral-400">Выберите раздел для редактирования</p>
+      <p className="mt-1 text-neutral-500 dark:text-neutral-400">Выберите раздел для редактирования</p>
 
       {/* Unread bookings widget */}
       {counts && counts.total > 0 && (
@@ -116,14 +116,14 @@ export default function AdminDashboard() {
             <Link
               key={card.href}
               href={card.href}
-              className="group rounded-xl border border-white/10 bg-neutral-900 p-5 transition-all hover:border-gold/30 hover:bg-neutral-900/80"
+              className="group rounded-xl border border-neutral-200 bg-white p-5 transition-all hover:border-gold/30 hover:bg-neutral-50 dark:border-white/10 dark:bg-neutral-900 dark:hover:bg-neutral-900/80"
             >
               <div className="flex items-center gap-3">
                 <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-gold/10 text-gold">
                   <Icon size={20} />
                 </div>
                 <div className="flex-1 min-w-0">
-                  <h2 className="font-medium text-white group-hover:text-gold transition-colors flex items-center gap-2">
+                  <h2 className="font-medium text-neutral-900 group-hover:text-gold transition-colors flex items-center gap-2 dark:text-white">
                     {card.label}
                     {isBookings && counts && counts.total > 0 && (
                       <span className="rounded-full bg-red-500 text-white text-[10px] font-bold min-w-[18px] h-[18px] flex items-center justify-center px-1">
@@ -131,7 +131,7 @@ export default function AdminDashboard() {
                       </span>
                     )}
                   </h2>
-                  <p className="text-xs text-neutral-500">{card.desc}</p>
+                  <p className="text-xs text-neutral-500 dark:text-neutral-500">{card.desc}</p>
                 </div>
               </div>
             </Link>
diff --git a/src/app/admin/schedule/page.tsx b/src/app/admin/schedule/page.tsx
index 093b71f..c6e020b 100644
--- a/src/app/admin/schedule/page.tsx
+++ b/src/app/admin/schedule/page.tsx
@@ -222,7 +222,7 @@ function ClassBlock({
           : {}),
       }}
       className={`absolute left-1 right-1 rounded-md border border-white/20 border-l-3 px-2 py-0.5 text-left text-xs text-white cursor-grab active:cursor-grabbing overflow-hidden select-none ${colors} ${
-        isOverlapping ? "ring-2 ring-red-500 ring-offset-1 ring-offset-neutral-900" : ""
+        isOverlapping ? "ring-2 ring-red-500 ring-offset-1 ring-offset-white dark:ring-offset-neutral-900" : ""
       } ${isDragging ? "opacity-30" : "hover:opacity-90 hover:border-white/40"}`}
       title={`${cls.time}\n${cls.type}\n${cls.trainer}${cls.level ? ` · ${cls.level}` : ""}${cls.status ? ` · ${cls.status}` : ""}`}
     >
@@ -415,14 +415,14 @@ function ClassModal({
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60" onClick={onClose}>
       <div
-        className="w-full max-w-md rounded-xl border border-white/10 bg-neutral-900 p-6 shadow-2xl"
+        className="w-full max-w-md rounded-xl border border-neutral-200 bg-white p-6 shadow-2xl dark:border-white/10 dark:bg-neutral-900"
         onClick={(e) => e.stopPropagation()}
       >
         <div className="flex items-center justify-between mb-4">
-          <h3 className="text-lg font-bold text-white">
+          <h3 className="text-lg font-bold text-neutral-900 dark:text-white">
             {isNew ? "Новое занятие" : "Редактировать занятие"}
           </h3>
-          <button type="button" onClick={onClose} className="text-neutral-400 hover:text-white">
+          <button type="button" onClick={onClose} className="text-neutral-400 hover:text-neutral-900 transition-colors dark:hover:text-white">
             <X size={20} />
           </button>
         </div>
@@ -431,7 +431,7 @@ function ClassModal({
           {/* Day selector */}
           {allDays.length > 1 && (
             <div>
-              <label className="block text-sm text-neutral-400 mb-2">Дни</label>
+              <label className="block text-sm text-neutral-500 mb-2 dark:text-neutral-400">Дни</label>
 
               {/* Day toggle buttons */}
               <div className="flex flex-wrap gap-1.5">
@@ -445,7 +445,7 @@ function ClassModal({
                       className={`rounded-lg px-3 py-1.5 text-xs font-medium transition-all ${
                         active
                           ? "bg-gold/20 text-gold border border-gold/40"
-                          : "border border-white/10 text-neutral-500 hover:text-white hover:border-white/20"
+                          : "border border-neutral-200 text-neutral-500 hover:text-neutral-900 hover:border-neutral-300 dark:border-white/10 dark:hover:text-white dark:hover:border-white/20"
                       }`}
                     >
                       {d.dayShort}
@@ -473,10 +473,10 @@ function ClassModal({
                   });
                 }
               }}
-              className="flex items-center gap-2 text-sm text-neutral-300 select-none"
+              className="flex items-center gap-2 text-sm text-neutral-600 select-none dark:text-neutral-300"
             >
               <span className={`inline-flex items-center justify-center w-4 h-4 rounded border transition-colors ${
-                sameTime ? "bg-gold border-gold" : "border-white/20 bg-neutral-800"
+                sameTime ? "bg-gold border-gold" : "border-neutral-300 bg-neutral-100 dark:border-white/20 dark:bg-neutral-800"
               }`}>
                 {sameTime && <span className="text-black text-xs font-bold leading-none">✓</span>}
               </span>
@@ -492,10 +492,10 @@ function ClassModal({
             />
           ) : (
             <div className="space-y-1.5">
-              <label className="block text-sm text-neutral-400">Время по дням</label>
+              <label className="block text-sm text-neutral-500 dark:text-neutral-400">Время по дням</label>
               {allDays.filter((d) => selectedDays.has(d.day)).map((d) => (
                 <div key={d.day} className="flex items-center gap-2">
-                  <span className="shrink-0 text-xs font-medium text-neutral-400 min-w-[28px]">
+                  <span className="shrink-0 text-xs font-medium text-neutral-500 min-w-[28px] dark:text-neutral-400">
                     {d.dayShort}
                   </span>
                   <div className="flex-1">
@@ -576,7 +576,7 @@ function ClassModal({
             }}
             className={`flex-1 rounded-lg px-4 py-2.5 text-sm font-medium transition-opacity ${
               touched && !isValid
-                ? "bg-neutral-700 text-neutral-400 cursor-not-allowed"
+                ? "bg-neutral-200 text-neutral-400 cursor-not-allowed dark:bg-neutral-700"
                 : "bg-gold text-black hover:opacity-90"
             }`}
           >
@@ -973,18 +973,18 @@ function CalendarGrid({
 
       {/* Calendar */}
       {sortedDays.length > 0 && (
-        <div className="overflow-x-auto rounded-lg border border-white/10" ref={gridRef}>
+        <div className="overflow-x-auto rounded-lg border border-neutral-200 dark:border-white/10" ref={gridRef}>
           <div className="min-w-[600px]">
             {/* Day headers */}
-            <div className="flex border-b border-white/10 bg-neutral-800/50">
-              <div className="w-14 shrink-0 bg-neutral-900" />
+            <div className="flex border-b border-neutral-200 bg-neutral-100 dark:border-white/10 dark:bg-neutral-800/50">
+              <div className="w-14 shrink-0 bg-neutral-50 dark:bg-neutral-900" />
               {sortedDays.map((day, di) => (
                 <div
                   key={day.day}
-                  className="flex-1 border-l border-white/10 px-2 py-2 text-center"
+                  className="flex-1 border-l border-neutral-200 px-2 py-2 text-center dark:border-white/10"
                 >
                   <div className="flex items-center justify-center gap-1">
-                    <span className="text-sm font-medium text-white">{day.dayShort}</span>
+                    <span className="text-sm font-medium text-neutral-900 dark:text-white">{day.dayShort}</span>
                     <span className="text-xs text-neutral-500">({day.classes.length})</span>
                   </div>
                 </div>
@@ -1017,7 +1017,7 @@ function CalendarGrid({
                   <div
                     key={day.day}
                     ref={(el) => { columnRefs.current[di] = el; }}
-                    className={`flex-1 border-l border-white/10 relative ${drag ? "cursor-grabbing" : "cursor-pointer"}`}
+                    className={`flex-1 border-l border-neutral-200 relative dark:border-white/10 ${drag ? "cursor-grabbing" : "cursor-pointer"}`}
                     style={{ height: `${TOTAL_HOURS * HOUR_HEIGHT}px` }}
                     onMouseMove={(e) => {
                       if (drag) return;
@@ -1044,7 +1044,7 @@ function CalendarGrid({
                     {hours.slice(0, -1).map((h) => (
                       <div
                         key={h}
-                        className="absolute left-0 right-0 border-t border-white/5"
+                        className="absolute left-0 right-0 border-t border-neutral-200/60 dark:border-white/5"
                         style={{ top: `${(h - HOUR_START) * HOUR_HEIGHT}px` }}
                       />
                     ))}
@@ -1052,7 +1052,7 @@ function CalendarGrid({
                     {hours.slice(0, -1).map((h) => (
                       <div
                         key={`${h}-30`}
-                        className="absolute left-0 right-0 border-t border-white/[0.02]"
+                        className="absolute left-0 right-0 border-t border-neutral-200/30 dark:border-white/[0.02]"
                         style={{ top: `${(h - HOUR_START) * HOUR_HEIGHT + HOUR_HEIGHT / 2}px` }}
                       />
                     ))}
@@ -1330,7 +1330,7 @@ export default function ScheduleEditorPage() {
                   className={`flex items-center gap-1 rounded-lg px-4 py-2 text-sm font-medium transition-colors ${
                     i === activeLocation
                       ? "bg-gold/10 text-gold border border-gold/30"
-                      : "border border-white/10 text-neutral-400 hover:text-white"
+                      : "border border-neutral-200 text-neutral-500 hover:text-neutral-900 dark:border-white/10 dark:text-neutral-400 dark:hover:text-white"
                   }`}
                 >
                   <button
@@ -1362,7 +1362,7 @@ export default function ScheduleEditorPage() {
                   update({ ...data, locations: newLocations });
                   setActiveLocation(newLocations.length - 1);
                 }}
-                className="rounded-lg border border-dashed border-white/20 px-4 py-2 text-sm text-neutral-500 hover:text-white transition-colors"
+                className="rounded-lg border border-dashed border-neutral-300 px-4 py-2 text-sm text-neutral-500 hover:text-neutral-900 transition-colors dark:border-white/20 dark:hover:text-white"
               >
                 <Plus size={14} className="inline" /> Локация
               </button>
diff --git a/src/app/admin/team/page.tsx b/src/app/admin/team/page.tsx
index d48b8bf..a4d4357 100644
--- a/src/app/admin/team/page.tsx
+++ b/src/app/admin/team/page.tsx
@@ -165,18 +165,18 @@ export default function TeamEditorPage() {
           renderItem={(member) => (
             <Link
               href={`/admin/team/${member.id}`}
-              className="flex items-center gap-4 flex-1 min-w-0 rounded-lg px-2 py-1.5 -my-1.5 hover:bg-white/[0.04] transition-colors"
+              className="flex items-center gap-4 flex-1 min-w-0 rounded-lg px-2 py-1.5 -my-1.5 hover:bg-neutral-100 transition-colors dark:hover:bg-white/[0.04]"
             >
               <div className="relative h-14 w-14 shrink-0 overflow-hidden rounded-lg">
                 {member.image ? (
                   <Image src={member.image} alt={member.name} fill className="object-cover" sizes="56px" />
                 ) : (
-                  <div className="h-full w-full bg-neutral-800" />
+                  <div className="h-full w-full bg-neutral-200 dark:bg-neutral-800" />
                 )}
               </div>
               <div className="flex-1 min-w-0">
-                <p className="font-medium text-white truncate">{member.name}</p>
-                <p className="text-sm text-neutral-400 truncate">{member.role}</p>
+                <p className="font-medium text-neutral-900 truncate dark:text-white">{member.name}</p>
+                <p className="text-sm text-neutral-500 truncate dark:text-neutral-400">{member.role}</p>
               </div>
             </Link>
           )}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index b72135a..5c6d49b 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -43,7 +43,14 @@ export default function RootLayout({
   children: React.ReactNode;
 }) {
   return (
-    <html lang="ru" className="dark">
+    <html lang="ru" suppressHydrationWarning>
+      <head>
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `(function(){try{var t=localStorage.getItem('theme');if(t==='light'){document.documentElement.classList.remove('dark')}else{document.documentElement.classList.add('dark')}}catch(e){}})();`,
+          }}
+        />
+      </head>
       <body
         className={`${inter.variable} ${oswald.variable} surface-base font-sans antialiased`}
       >
diff --git a/src/components/ui/YandexMap.tsx b/src/components/ui/YandexMap.tsx
index a0e6272..f794cfb 100644
--- a/src/components/ui/YandexMap.tsx
+++ b/src/components/ui/YandexMap.tsx
@@ -20,15 +20,32 @@ function cleanAddress(addr: string): string {
     .trim();
 }
 
+function useIsDark() {
+  const [dark, setDark] = useState(true);
+
+  useEffect(() => {
+    function check() {
+      setDark(document.documentElement.classList.contains("dark"));
+    }
+    check();
+
+    const observer = new MutationObserver(check);
+    observer.observe(document.documentElement, { attributes: true, attributeFilter: ["class"] });
+    return () => observer.disconnect();
+  }, []);
+
+  return dark;
+}
+
 export function YandexMap({ addresses, height = 380 }: YandexMapProps) {
-  const [mapSrc, setMapSrc] = useState<string | null>(null);
+  const [baseUrl, setBaseUrl] = useState<string | null>(null);
+  const isDark = useIsDark();
 
   useEffect(() => {
     if (!addresses.length) return;
     let cancelled = false;
 
     async function build() {
-      // Geocode all addresses in parallel
       const results = await Promise.allSettled(
         addresses.map(async (addr) => {
           const cleaned = cleanAddress(addr);
@@ -55,9 +72,9 @@ export function YandexMap({ addresses, height = 380 }: YandexMapProps) {
       const centerLat = points.reduce((s, p) => s + p.lat, 0) / points.length;
       const centerLon = points.reduce((s, p) => s + p.lon, 0) / points.length;
       const zoom = points.length === 1 ? 15 : 12;
-
       const pts = points.map((p) => `${p.lon},${p.lat},pm2ntl`).join("~");
-      setMapSrc(`https://yandex.ru/map-widget/v1/?ll=${centerLon},${centerLat}&z=${zoom}&pt=${pts}&l=map&theme=dark`);
+
+      setBaseUrl(`https://yandex.ru/map-widget/v1/?ll=${centerLon},${centerLat}&z=${zoom}&pt=${pts}&l=map`);
     }
 
     build();
@@ -66,7 +83,7 @@ export function YandexMap({ addresses, height = 380 }: YandexMapProps) {
 
   if (!addresses.length) return null;
 
-  if (!mapSrc) {
+  if (!baseUrl) {
     return (
       <div style={{ width: "100%", height }} className="flex items-center justify-center text-neutral-500 text-sm">
         Загрузка карты...
@@ -74,8 +91,11 @@ export function YandexMap({ addresses, height = 380 }: YandexMapProps) {
     );
   }
 
+  const mapSrc = `${baseUrl}&theme=${isDark ? "dark" : "light"}`;
+
   return (
     <iframe
+      key={mapSrc}
       src={mapSrc}
       width="100%"
       height={height}