From fc822cb70d3fff46d0947fec72482dd3bab70d36 Mon Sep 17 00:00:00 2001
From: deexsed <listev.2002@ya.ru>
Date: Tue, 24 Mar 2026 16:20:56 +0300
Subject: [PATCH] refactor: extract UI to ui package, tooltips, tg:// host fix

- Add ui/ (ctk_theme, ctk_tray_ui, ctk_tooltip): shared Windows/Linux theme, settings form, first-run, validation

- Register ui package in pyproject.toml wheel

- Tooltips on settings fields for new users

- tg://socks URL uses configured host (not hardcoded 127.0.0.1) on Windows, Linux, macOS
---
 linux.py          | 359 ++++++++--------------------------------------
 macos.py          |   3 +-
 pyproject.toml    |   2 +-
 ui/__init__.py    |   4 +
 ui/ctk_theme.py   |  88 ++++++++++++
 ui/ctk_tooltip.py | 114 +++++++++++++++
 ui/ctk_tray_ui.py | 353 +++++++++++++++++++++++++++++++++++++++++++++
 windows.py        | 306 +++++++++------------------------------
 8 files changed, 687 insertions(+), 542 deletions(-)
 create mode 100644 ui/__init__.py
 create mode 100644 ui/ctk_theme.py
 create mode 100644 ui/ctk_tooltip.py
 create mode 100644 ui/ctk_tray_ui.py

diff --git a/linux.py b/linux.py
index 664c948..a74214a 100644
--- a/linux.py
+++ b/linux.py
@@ -19,6 +19,20 @@ import pystray
 from PIL import Image, ImageDraw, ImageFont
 
 import proxy.tg_ws_proxy as tg_ws_proxy
+from ui.ctk_tray_ui import (
+    install_tray_config_buttons,
+    install_tray_config_form,
+    populate_first_run_window,
+    validate_config_form,
+)
+from ui.ctk_theme import (
+    CONFIG_DIALOG_FRAME_PAD,
+    CONFIG_DIALOG_SIZE,
+    FIRST_RUN_SIZE,
+    create_ctk_root,
+    ctk_theme_for_platform,
+    main_content_frame,
+)
 
 APP_NAME = "TgWsProxy"
 APP_DIR = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config")) / APP_NAME
@@ -226,6 +240,16 @@ def _load_icon():
     return _make_icon_image()
 
 
+def _apply_linux_ctk_window_icon(root) -> None:
+    """PhotoImage храним на root — иначе GC может убрать картинку до закрытия окна."""
+    icon_img = _load_icon()
+    if icon_img:
+        from PIL import ImageTk
+
+        root._ctk_icon_photo = ImageTk.PhotoImage(icon_img.resize((64, 64)))
+        root.iconphoto(False, root._ctk_icon_photo)
+
+
 def _run_proxy_thread(
     port: int, dc_opt: Dict[int, str], verbose: bool, host: str = "127.0.0.1"
 ):
@@ -325,8 +349,9 @@ def _show_info(text: str, title: str = "TG WS Proxy"):
 
 
 def _on_open_in_telegram(icon=None, item=None):
+    host = _config.get("host", DEFAULT_CONFIG["host"])
     port = _config.get("port", DEFAULT_CONFIG["port"])
-    url = f"tg://socks?server=127.0.0.1&port={port}"
+    url = f"tg://socks?server={host}&port={port}"
     log.info("Copying %s", url)
 
     try:
@@ -355,192 +380,34 @@ def _edit_config_dialog():
 
     cfg = dict(_config)
 
-    ctk.set_appearance_mode("light")
-    ctk.set_default_color_theme("blue")
+    theme = ctk_theme_for_platform()
+    w, h = CONFIG_DIALOG_SIZE
 
-    root = ctk.CTk()
-    root.title("TG WS Proxy — Настройки")
-    root.resizable(False, False)
-    root.attributes("-topmost", True)
-
-    icon_img = _load_icon()
-    if icon_img:
-        from PIL import ImageTk
-
-        _photo = ImageTk.PhotoImage(icon_img.resize((64, 64)))
-        root.iconphoto(False, _photo)
-
-    TG_BLUE = "#3390ec"
-    TG_BLUE_HOVER = "#2b7cd4"
-    BG = "#ffffff"
-    FIELD_BG = "#f0f2f5"
-    FIELD_BORDER = "#d6d9dc"
-    TEXT_PRIMARY = "#000000"
-    TEXT_SECONDARY = "#707579"
-    FONT_FAMILY = "Sans"
-
-    w, h = 420, 540
-    sw = root.winfo_screenwidth()
-    sh = root.winfo_screenheight()
-    root.geometry(f"{w}x{h}+{(sw - w) // 2}+{(sh - h) // 2}")
-    root.configure(fg_color=BG)
-
-    frame = ctk.CTkFrame(root, fg_color=BG, corner_radius=0)
-    frame.pack(fill="both", expand=True, padx=24, pady=20)
-
-    # Host
-    ctk.CTkLabel(
-        frame,
-        text="IP-адрес прокси",
-        font=(FONT_FAMILY, 13),
-        text_color=TEXT_PRIMARY,
-        anchor="w",
-    ).pack(anchor="w", pady=(0, 4))
-    host_var = ctk.StringVar(value=cfg.get("host", "127.0.0.1"))
-    host_entry = ctk.CTkEntry(
-        frame,
-        textvariable=host_var,
-        width=200,
-        height=36,
-        font=(FONT_FAMILY, 13),
-        corner_radius=10,
-        fg_color=FIELD_BG,
-        border_color=FIELD_BORDER,
-        border_width=1,
-        text_color=TEXT_PRIMARY,
+    root = create_ctk_root(
+        ctk,
+        title="TG WS Proxy — Настройки",
+        width=w,
+        height=h,
+        theme=theme,
+        after_create=_apply_linux_ctk_window_icon,
     )
-    host_entry.pack(anchor="w", pady=(0, 12))
 
-    # Port
-    ctk.CTkLabel(
-        frame,
-        text="Порт прокси",
-        font=(FONT_FAMILY, 13),
-        text_color=TEXT_PRIMARY,
-        anchor="w",
-    ).pack(anchor="w", pady=(0, 4))
-    port_var = ctk.StringVar(value=str(cfg.get("port", 1080)))
-    port_entry = ctk.CTkEntry(
-        frame,
-        textvariable=port_var,
-        width=120,
-        height=36,
-        font=(FONT_FAMILY, 13),
-        corner_radius=10,
-        fg_color=FIELD_BG,
-        border_color=FIELD_BORDER,
-        border_width=1,
-        text_color=TEXT_PRIMARY,
+    fpx, fpy = CONFIG_DIALOG_FRAME_PAD
+    frame = main_content_frame(ctk, root, theme, padx=fpx, pady=fpy)
+
+    widgets = install_tray_config_form(
+        ctk, frame, theme, cfg, DEFAULT_CONFIG,
+        show_autostart=False,
     )
-    port_entry.pack(anchor="w", pady=(0, 12))
-
-    # DC-IP mappings
-    ctk.CTkLabel(
-        frame,
-        text="DC → IP маппинги (по одному на строку, формат DC:IP)",
-        font=(FONT_FAMILY, 13),
-        text_color=TEXT_PRIMARY,
-        anchor="w",
-    ).pack(anchor="w", pady=(0, 4))
-    dc_textbox = ctk.CTkTextbox(
-        frame,
-        width=370,
-        height=120,
-        font=("Monospace", 12),
-        corner_radius=10,
-        fg_color=FIELD_BG,
-        border_color=FIELD_BORDER,
-        border_width=1,
-        text_color=TEXT_PRIMARY,
-    )
-    dc_textbox.pack(anchor="w", pady=(0, 12))
-    dc_textbox.insert("1.0", "\n".join(cfg.get("dc_ip", DEFAULT_CONFIG["dc_ip"])))
-
-    # Verbose
-    verbose_var = ctk.BooleanVar(value=cfg.get("verbose", False))
-    ctk.CTkCheckBox(
-        frame,
-        text="Подробное логирование (verbose)",
-        variable=verbose_var,
-        font=(FONT_FAMILY, 13),
-        text_color=TEXT_PRIMARY,
-        fg_color=TG_BLUE,
-        hover_color=TG_BLUE_HOVER,
-        corner_radius=6,
-        border_width=2,
-        border_color=FIELD_BORDER,
-    ).pack(anchor="w", pady=(0, 8))
-
-    # Advanced: buf_kb, pool_size, log_max_mb
-    adv_frame = ctk.CTkFrame(frame, fg_color="transparent")
-    adv_frame.pack(anchor="w", fill="x", pady=(4, 8))
-
-    for col, (lbl, key, w_) in enumerate([
-        ("Буфер (KB, 256 default)", "buf_kb", 120),
-        ("WS пулов (4 default)", "pool_size", 120),
-        ("Log size (MB, 5 def)", "log_max_mb", 120),
-    ]):
-        col_frame = ctk.CTkFrame(adv_frame, fg_color="transparent")
-        col_frame.pack(side="left", padx=(0, 10))
-        ctk.CTkLabel(col_frame, text=lbl, font=(FONT_FAMILY, 11),
-                     text_color=TEXT_SECONDARY, anchor="w").pack(anchor="w")
-        ctk.CTkEntry(col_frame, width=w_, height=30, font=(FONT_FAMILY, 12),
-                     corner_radius=8, fg_color=FIELD_BG,
-                     border_color=FIELD_BORDER, border_width=1,
-                     text_color=TEXT_PRIMARY,
-                     textvariable=ctk.StringVar(
-                         value=str(cfg.get(key, DEFAULT_CONFIG[key]))
-                     )).pack(anchor="w")
-
-    _adv_entries = list(adv_frame.winfo_children())
-    _adv_keys = ["buf_kb", "pool_size", "log_max_mb"]
 
     def on_save():
-        import socket as _sock
-
-        host_val = host_var.get().strip()
-        try:
-            _sock.inet_aton(host_val)
-        except OSError:
-            _show_error("Некорректный IP-адрес.")
+        merged = validate_config_form(
+            widgets, DEFAULT_CONFIG, include_autostart=False)
+        if isinstance(merged, str):
+            _show_error(merged)
             return
 
-        try:
-            port_val = int(port_var.get().strip())
-            if not (1 <= port_val <= 65535):
-                raise ValueError
-        except ValueError:
-            _show_error("Порт должен быть числом 1-65535")
-            return
-
-        lines = [
-            l.strip()
-            for l in dc_textbox.get("1.0", "end").strip().splitlines()
-            if l.strip()
-        ]
-        try:
-            tg_ws_proxy.parse_dc_ip_list(lines)
-        except ValueError as e:
-            _show_error(str(e))
-            return
-
-        new_cfg = {
-            "host": host_val,
-            "port": port_val,
-            "dc_ip": lines,
-            "verbose": verbose_var.get(),
-        }
-
-        for i, key in enumerate(_adv_keys):
-            col_frame = _adv_entries[i]
-            entry = col_frame.winfo_children()[1]
-            try:
-                val = float(entry.get().strip())
-                if key in ("buf_kb", "pool_size"):
-                    val = int(val)
-                new_cfg[key] = val
-            except ValueError:
-                new_cfg[key] = DEFAULT_CONFIG[key]
+        new_cfg = merged
         save_config(new_cfg)
         _config.update(new_cfg)
         log.info("Config saved: %s", new_cfg)
@@ -562,19 +429,8 @@ def _edit_config_dialog():
     def on_cancel():
         root.destroy()
 
-    btn_frame = ctk.CTkFrame(frame, fg_color="transparent")
-    btn_frame.pack(fill="x", pady=(20, 0))
-    ctk.CTkButton(btn_frame, text="Сохранить", height=38,
-                  font=(FONT_FAMILY, 14, "bold"), corner_radius=10,
-                  fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
-                  text_color="#ffffff",
-                  command=on_save).pack(side="left", fill="x", expand=True, padx=(0, 8))
-    ctk.CTkButton(btn_frame, text="Отмена", height=38,
-                  font=(FONT_FAMILY, 14), corner_radius=10,
-                  fg_color=FIELD_BG, hover_color=FIELD_BORDER,
-                  text_color=TEXT_PRIMARY, border_width=1,
-                  border_color=FIELD_BORDER,
-                  command=on_cancel).pack(side="right", fill="x", expand=True)
+    install_tray_config_buttons(
+        ctk, frame, theme, on_save=on_save, on_cancel=on_cancel)
 
     root.mainloop()
 
@@ -624,127 +480,32 @@ def _show_first_run():
 
     host = _config.get("host", DEFAULT_CONFIG["host"])
     port = _config.get("port", DEFAULT_CONFIG["port"])
-    tg_url = f"tg://socks?server={host}&port={port}"
 
     if ctk is None:
         FIRST_RUN_MARKER.touch()
         return
 
-    ctk.set_appearance_mode("light")
-    ctk.set_default_color_theme("blue")
+    theme = ctk_theme_for_platform()
+    w, h = FIRST_RUN_SIZE
 
-    TG_BLUE = "#3390ec"
-    TG_BLUE_HOVER = "#2b7cd4"
-    BG = "#ffffff"
-    FIELD_BG = "#f0f2f5"
-    FIELD_BORDER = "#d6d9dc"
-    TEXT_PRIMARY = "#000000"
-    TEXT_SECONDARY = "#707579"
-    FONT_FAMILY = "Sans"
-
-    root = ctk.CTk()
-    root.title("TG WS Proxy")
-    root.resizable(False, False)
-    root.attributes("-topmost", True)
-
-    icon_img = _load_icon()
-    if icon_img:
-        from PIL import ImageTk
-
-        _photo = ImageTk.PhotoImage(icon_img.resize((64, 64)))
-        root.iconphoto(False, _photo)
-
-    w, h = 520, 440
-    sw = root.winfo_screenwidth()
-    sh = root.winfo_screenheight()
-    root.geometry(f"{w}x{h}+{(sw - w) // 2}+{(sh - h) // 2}")
-    root.configure(fg_color=BG)
-
-    frame = ctk.CTkFrame(root, fg_color=BG, corner_radius=0)
-    frame.pack(fill="both", expand=True, padx=28, pady=24)
-
-    title_frame = ctk.CTkFrame(frame, fg_color="transparent")
-    title_frame.pack(anchor="w", pady=(0, 16), fill="x")
-
-    # Blue accent bar
-    accent_bar = ctk.CTkFrame(
-        title_frame, fg_color=TG_BLUE, width=4, height=32, corner_radius=2
-    )
-    accent_bar.pack(side="left", padx=(0, 12))
-
-    ctk.CTkLabel(
-        title_frame,
-        text="Прокси запущен и работает в системном трее",
-        font=(FONT_FAMILY, 17, "bold"),
-        text_color=TEXT_PRIMARY,
-    ).pack(side="left")
-
-    # Info sections
-    sections = [
-        ("Как подключить Telegram Desktop:", True),
-        ("  Автоматически:", True),
-        (f"  ПКМ по иконке в трее → «Открыть в Telegram»", False),
-        (f"  Или ссылка: {tg_url}", False),
-        ("\n  Вручную:", True),
-        ("  Настройки → Продвинутые → Тип подключения → Прокси", False),
-        (f"  SOCKS5 → {host} : {port} (без логина/пароля)", False),
-    ]
-
-    for text, bold in sections:
-        weight = "bold" if bold else "normal"
-        ctk.CTkLabel(
-            frame,
-            text=text,
-            font=(FONT_FAMILY, 13, weight),
-            text_color=TEXT_PRIMARY,
-            anchor="w",
-            justify="left",
-        ).pack(anchor="w", pady=1)
-
-    # Spacer
-    ctk.CTkFrame(frame, fg_color="transparent", height=16).pack()
-
-    # Separator
-    ctk.CTkFrame(frame, fg_color=FIELD_BORDER, height=1, corner_radius=0).pack(
-        fill="x", pady=(0, 12)
+    root = create_ctk_root(
+        ctk,
+        title="TG WS Proxy",
+        width=w,
+        height=h,
+        theme=theme,
+        after_create=_apply_linux_ctk_window_icon,
     )
 
-    # Checkbox
-    auto_var = ctk.BooleanVar(value=True)
-    ctk.CTkCheckBox(
-        frame,
-        text="Открыть прокси в Telegram сейчас",
-        variable=auto_var,
-        font=(FONT_FAMILY, 13),
-        text_color=TEXT_PRIMARY,
-        fg_color=TG_BLUE,
-        hover_color=TG_BLUE_HOVER,
-        corner_radius=6,
-        border_width=2,
-        border_color=FIELD_BORDER,
-    ).pack(anchor="w", pady=(0, 16))
-
-    def on_ok():
+    def on_done(open_tg: bool):
         FIRST_RUN_MARKER.touch()
-        open_tg = auto_var.get()
         root.destroy()
         if open_tg:
             _on_open_in_telegram()
 
-    ctk.CTkButton(
-        frame,
-        text="Начать",
-        width=180,
-        height=42,
-        font=(FONT_FAMILY, 15, "bold"),
-        corner_radius=10,
-        fg_color=TG_BLUE,
-        hover_color=TG_BLUE_HOVER,
-        text_color="#ffffff",
-        command=on_ok,
-    ).pack(pady=(0, 0))
+    populate_first_run_window(
+        ctk, root, theme, host=host, port=port, on_done=on_done)
 
-    root.protocol("WM_DELETE_WINDOW", on_ok)
     root.mainloop()
 
 
diff --git a/macos.py b/macos.py
index 46eb5cf..b91d83a 100644
--- a/macos.py
+++ b/macos.py
@@ -356,8 +356,9 @@ def restart_proxy():
 # Menu callbacks
 
 def _on_open_in_telegram(_=None):
+    host = _config.get("host", DEFAULT_CONFIG["host"])
     port = _config.get("port", DEFAULT_CONFIG["port"])
-    url = f"tg://socks?server=127.0.0.1&port={port}"
+    url = f"tg://socks?server={host}&port={port}"
     log.info("Opening %s", url)
     try:
         result = subprocess.call(['open', url])
diff --git a/pyproject.toml b/pyproject.toml
index 0524036..f4897ff 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,7 +62,7 @@ Source = "https://github.com/Flowseal/tg-ws-proxy"
 Issues = "https://github.com/Flowseal/tg-ws-proxy/issues"
 
 [tool.hatch.build.targets.wheel]
-packages = ["proxy"]
+packages = ["proxy", "ui"]
 
 [tool.hatch.build.force-include]
 "windows.py" = "windows.py"
diff --git a/ui/__init__.py b/ui/__init__.py
new file mode 100644
index 0000000..57b7b3a
--- /dev/null
+++ b/ui/__init__.py
@@ -0,0 +1,4 @@
+"""
+Интерфейс tray (CustomTkinter): тема, диалоги настроек, подсказки.
+Ядро прокси — пакет `proxy`.
+"""
diff --git a/ui/ctk_theme.py b/ui/ctk_theme.py
new file mode 100644
index 0000000..3980b21
--- /dev/null
+++ b/ui/ctk_theme.py
@@ -0,0 +1,88 @@
+"""
+Общая светлая тема и фабрика окон CustomTkinter для tray-приложений (Windows / Linux).
+Цвета и отступы задаются в одном месте — правки темы не дублируются по платформам.
+"""
+
+from __future__ import annotations
+
+import sys
+from dataclasses import dataclass
+from typing import Any, Callable, Optional, Tuple
+
+# Размеры и отступы (единые для диалогов настроек и первого запуска)
+CONFIG_DIALOG_SIZE: Tuple[int, int] = (420, 540)
+CONFIG_DIALOG_FRAME_PAD: Tuple[int, int] = (24, 20)
+FIRST_RUN_SIZE: Tuple[int, int] = (520, 440)
+FIRST_RUN_FRAME_PAD: Tuple[int, int] = (28, 24)
+
+
+@dataclass(frozen=True)
+class CtkTheme:
+    """Палитра Telegram-style и семейства шрифтов для UI и моноширинного текста."""
+
+    tg_blue: str = "#3390ec"
+    tg_blue_hover: str = "#2b7cd4"
+    bg: str = "#ffffff"
+    field_bg: str = "#f0f2f5"
+    field_border: str = "#d6d9dc"
+    text_primary: str = "#000000"
+    text_secondary: str = "#707579"
+    ui_font_family: str = "Sans"
+    mono_font_family: str = "Monospace"
+
+
+def ctk_theme_for_platform() -> CtkTheme:
+    if sys.platform == "win32":
+        return CtkTheme(ui_font_family="Segoe UI", mono_font_family="Consolas")
+    return CtkTheme()
+
+
+def apply_ctk_appearance(ctk: Any) -> None:
+    ctk.set_appearance_mode("light")
+    ctk.set_default_color_theme("blue")
+
+
+def center_ctk_geometry(root: Any, width: int, height: int) -> None:
+    sw = root.winfo_screenwidth()
+    sh = root.winfo_screenheight()
+    root.geometry(f"{width}x{height}+{(sw - width) // 2}+{(sh - height) // 2}")
+
+
+def create_ctk_root(
+    ctk: Any,
+    *,
+    title: str,
+    width: int,
+    height: int,
+    theme: CtkTheme,
+    topmost: bool = True,
+    after_create: Optional[Callable[[Any], None]] = None,
+) -> Any:
+    """
+    Создаёт CTk: глобальная тема, заголовок, без ресайза, по центру экрана, фон из палитры.
+    after_create — опционально: установка иконки окна (различается по ОС).
+    """
+    apply_ctk_appearance(ctk)
+    root = ctk.CTk()
+    root.title(title)
+    root.resizable(False, False)
+    if topmost:
+        root.attributes("-topmost", True)
+    center_ctk_geometry(root, width, height)
+    root.configure(fg_color=theme.bg)
+    if after_create:
+        after_create(root)
+    return root
+
+
+def main_content_frame(
+    ctk: Any,
+    root: Any,
+    theme: CtkTheme,
+    *,
+    padx: int,
+    pady: int,
+) -> Any:
+    frame = ctk.CTkFrame(root, fg_color=theme.bg, corner_radius=0)
+    frame.pack(fill="both", expand=True, padx=padx, pady=pady)
+    return frame
diff --git a/ui/ctk_tooltip.py b/ui/ctk_tooltip.py
new file mode 100644
index 0000000..16c6da7
--- /dev/null
+++ b/ui/ctk_tooltip.py
@@ -0,0 +1,114 @@
+"""
+Всплывающие подсказки для CustomTkinter / tk: задержка, Toplevel без рамки, wrap.
+"""
+
+from __future__ import annotations
+
+import tkinter as tk
+from typing import Any, List, Optional
+
+
+class CtkTooltip:
+    """Показ текста при наведении на виджет."""
+
+    def __init__(
+        self,
+        widget: Any,
+        text: str,
+        *,
+        delay_ms: int = 450,
+        wraplength: int = 320,
+    ) -> None:
+        self.widget = widget
+        self.text = text
+        self.delay_ms = delay_ms
+        self.wraplength = wraplength
+        self._after_id: Optional[str] = None
+        self._tip: Optional[tk.Toplevel] = None
+        widget.bind("<Enter>", self._schedule, add="+")
+        widget.bind("<Leave>", self._hide, add="+")
+        widget.bind("<Button>", self._hide, add="+")
+        widget.bind("<Destroy>", self._on_destroy, add="+")
+
+    def _schedule(self, _event: Any = None) -> None:
+        self._cancel_after()
+        self._after_id = self.widget.after(self.delay_ms, self._show)
+
+    def _cancel_after(self) -> None:
+        if self._after_id is not None:
+            try:
+                self.widget.after_cancel(self._after_id)
+            except Exception:
+                pass
+            self._after_id = None
+
+    def _show(self) -> None:
+        self._after_id = None
+        if self._tip is not None:
+            return
+        try:
+            if not self.widget.winfo_exists():
+                return
+        except Exception:
+            return
+
+        tw = tk.Toplevel(self.widget.winfo_toplevel())
+        tw.wm_overrideredirect(True)
+        try:
+            tw.wm_attributes("-topmost", True)
+        except Exception:
+            pass
+        tw.configure(bg="#2b2b2b")
+        lbl = tk.Label(
+            tw,
+            text=self.text,
+            justify="left",
+            wraplength=self.wraplength,
+            background="#2b2b2b",
+            foreground="#f0f0f0",
+            relief="flat",
+            borderwidth=0,
+            padx=10,
+            pady=8,
+            font=("Segoe UI", 10) if _is_windows() else None,
+        )
+        lbl.pack()
+        x = self.widget.winfo_rootx() + 12
+        y = self.widget.winfo_rooty() + self.widget.winfo_height() + 4
+        tw.wm_geometry(f"+{x}+{y}")
+        self._tip = tw
+
+    def _hide(self, _event: Any = None) -> None:
+        self._cancel_after()
+        if self._tip is not None:
+            try:
+                self._tip.destroy()
+            except Exception:
+                pass
+            self._tip = None
+
+    def _on_destroy(self, _event: Any = None) -> None:
+        self._hide()
+
+
+def _is_windows() -> bool:
+    import sys
+
+    return sys.platform == "win32"
+
+
+def attach_ctk_tooltip(
+    widget: Any,
+    text: str,
+    *,
+    delay_ms: int = 450,
+    wraplength: int = 320,
+) -> None:
+    """Повесить подсказку на виджет (CTk или tk)."""
+    CtkTooltip(widget, text, delay_ms=delay_ms, wraplength=wraplength)
+
+
+def attach_tooltip_to_widgets(widgets: List[Any], text: str, **kwargs: Any) -> None:
+    """Одна и та же подсказка на несколько виджетов (подпись + поле)."""
+    for w in widgets:
+        attach_ctk_tooltip(w, text, **kwargs)
diff --git a/ui/ctk_tray_ui.py b/ui/ctk_tray_ui.py
new file mode 100644
index 0000000..25d9594
--- /dev/null
+++ b/ui/ctk_tray_ui.py
@@ -0,0 +1,353 @@
+"""
+Общая разметка CustomTkinter для tray (Windows / Linux): настройки и первый запуск.
+Логика сохранения и колбэки остаются в платформенных модулях.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+
+import proxy.tg_ws_proxy as tg_ws_proxy
+
+from ui.ctk_theme import (
+    FIRST_RUN_FRAME_PAD,
+    CtkTheme,
+    main_content_frame,
+)
+from ui.ctk_tooltip import attach_ctk_tooltip, attach_tooltip_to_widgets
+
+# Подсказки для формы настроек (новые пользователи)
+_TIP_HOST = (
+    "Адрес, на котором прокси принимает SOCKS5-подключения.\n"
+    "Обычно 127.0.0.1 — только этот компьютер. Другой IP нужен, "
+    "если к прокси подключаются по локальной сети."
+)
+_TIP_PORT = (
+    "Порт SOCKS5. В Telegram Desktop в настройках прокси должен быть "
+    "указан тот же порт (часто 1080)."
+)
+_TIP_DC = (
+    "Соответствие номера датацентра Telegram (DC) и IP-адреса сервера.\n"
+    "Каждая строка: «номер:IP», например 2:149.154.167.220. "
+    "Прокси по этим правилам направляет трафик к нужным серверам Telegram."
+)
+_TIP_VERBOSE = (
+    "Если включено, в файл логов пишется больше подробностей — "
+    "удобно при поиске неполадок."
+)
+_TIP_BUF_KB = (
+    "Размер буфера приёма/передачи в килобайтах.\n"
+    "Больше значение — обычно стабильнее на быстрых каналах, выше расход памяти."
+)
+_TIP_POOL = (
+    "Сколько параллельных WebSocket-сессий к одному датацентру можно держать.\n"
+    "Увеличение может помочь при высокой нагрузке."
+)
+_TIP_LOG_MB = (
+    "Максимальный размер файла лога; при достижении лимита файл перезаписывается."
+)
+_TIP_AUTOSTART = (
+    "Запускать TG WS Proxy при входе в Windows. "
+    "Если вы переместите программу в другую папку, запись автозапуска может сброситься."
+)
+_TIP_SAVE = "Сохранить настройки в файл. После сохранения можно перезапустить прокси."
+_TIP_CANCEL = "Закрыть окно без сохранения изменений."
+
+
+@dataclass
+class TrayConfigFormWidgets:
+    host_var: Any
+    port_var: Any
+    dc_textbox: Any
+    verbose_var: Any
+    adv_entries: List[Any]
+    adv_keys: Tuple[str, ...]
+    autostart_var: Optional[Any]
+
+
+def install_tray_config_form(
+    ctk: Any,
+    frame: Any,
+    theme: CtkTheme,
+    cfg: dict,
+    default_config: dict,
+    *,
+    show_autostart: bool = False,
+    autostart_value: bool = False,
+) -> TrayConfigFormWidgets:
+    """Поля настроек прокси внутри уже созданного `frame`."""
+    host_lbl = ctk.CTkLabel(frame, text="IP-адрес прокси",
+                            font=(theme.ui_font_family, 13),
+                            text_color=theme.text_primary, anchor="w")
+    host_lbl.pack(anchor="w", pady=(0, 4))
+    host_var = ctk.StringVar(value=cfg.get("host", default_config["host"]))
+    host_entry = ctk.CTkEntry(
+        frame, textvariable=host_var, width=200, height=36,
+        font=(theme.ui_font_family, 13), corner_radius=10,
+        fg_color=theme.field_bg, border_color=theme.field_border,
+        border_width=1, text_color=theme.text_primary)
+    host_entry.pack(anchor="w", pady=(0, 12))
+    attach_tooltip_to_widgets([host_lbl, host_entry], _TIP_HOST)
+
+    port_lbl = ctk.CTkLabel(frame, text="Порт прокси",
+                            font=(theme.ui_font_family, 13),
+                            text_color=theme.text_primary, anchor="w")
+    port_lbl.pack(anchor="w", pady=(0, 4))
+    port_var = ctk.StringVar(value=str(cfg.get("port", default_config["port"])))
+    port_entry = ctk.CTkEntry(
+        frame, textvariable=port_var, width=120, height=36,
+        font=(theme.ui_font_family, 13), corner_radius=10,
+        fg_color=theme.field_bg, border_color=theme.field_border,
+        border_width=1, text_color=theme.text_primary)
+    port_entry.pack(anchor="w", pady=(0, 12))
+    attach_tooltip_to_widgets([port_lbl, port_entry], _TIP_PORT)
+
+    dc_lbl = ctk.CTkLabel(
+        frame, text="DC → IP маппинги (по одному на строку, формат DC:IP)",
+        font=(theme.ui_font_family, 13), text_color=theme.text_primary,
+        anchor="w")
+    dc_lbl.pack(anchor="w", pady=(0, 4))
+    dc_textbox = ctk.CTkTextbox(
+        frame, width=370, height=120,
+        font=(theme.mono_font_family, 12), corner_radius=10,
+        fg_color=theme.field_bg, border_color=theme.field_border,
+        border_width=1, text_color=theme.text_primary)
+    dc_textbox.pack(anchor="w", pady=(0, 12))
+    dc_textbox.insert("1.0", "\n".join(cfg.get("dc_ip", default_config["dc_ip"])))
+    attach_tooltip_to_widgets([dc_lbl, dc_textbox], _TIP_DC)
+
+    verbose_var = ctk.BooleanVar(value=cfg.get("verbose", False))
+    verbose_cb = ctk.CTkCheckBox(
+        frame, text="Подробное логирование (verbose)",
+        variable=verbose_var, font=(theme.ui_font_family, 13),
+        text_color=theme.text_primary,
+        fg_color=theme.tg_blue, hover_color=theme.tg_blue_hover,
+        corner_radius=6, border_width=2,
+        border_color=theme.field_border)
+    verbose_cb.pack(anchor="w", pady=(0, 8))
+    attach_ctk_tooltip(verbose_cb, _TIP_VERBOSE)
+
+    adv_frame = ctk.CTkFrame(frame, fg_color="transparent")
+    adv_frame.pack(anchor="w", fill="x", pady=(4, 8))
+
+    adv_rows = [
+        ("Буфер (KB, 256 default)", "buf_kb", 120, _TIP_BUF_KB),
+        ("WS пулов (4 default)", "pool_size", 120, _TIP_POOL),
+        ("Log size (MB, 5 def)", "log_max_mb", 120, _TIP_LOG_MB),
+    ]
+    for lbl, key, w_, tip in adv_rows:
+        col_frame = ctk.CTkFrame(adv_frame, fg_color="transparent")
+        col_frame.pack(side="left", padx=(0, 10))
+        adv_l = ctk.CTkLabel(col_frame, text=lbl, font=(theme.ui_font_family, 11),
+                             text_color=theme.text_secondary, anchor="w")
+        adv_l.pack(anchor="w")
+        adv_e = ctk.CTkEntry(
+            col_frame, width=w_, height=30, font=(theme.ui_font_family, 12),
+            corner_radius=8, fg_color=theme.field_bg,
+            border_color=theme.field_border, border_width=1,
+            text_color=theme.text_primary,
+            textvariable=ctk.StringVar(
+                value=str(cfg.get(key, default_config[key]))
+            ))
+        adv_e.pack(anchor="w")
+        attach_tooltip_to_widgets([adv_l, adv_e, col_frame], tip)
+
+    adv_entries = list(adv_frame.winfo_children())
+    adv_keys = ("buf_kb", "pool_size", "log_max_mb")
+
+    autostart_var = None
+    if show_autostart:
+        autostart_var = ctk.BooleanVar(value=autostart_value)
+        as_cb = ctk.CTkCheckBox(
+            frame, text="Автозапуск при включении Windows",
+            variable=autostart_var, font=(theme.ui_font_family, 13),
+            text_color=theme.text_primary,
+            fg_color=theme.tg_blue, hover_color=theme.tg_blue_hover,
+            corner_radius=6, border_width=2,
+            border_color=theme.field_border)
+        as_cb.pack(anchor="w", pady=(0, 8))
+        as_hint = ctk.CTkLabel(
+            frame, text="При перемещении файла или открытии из другой папки\n"
+            "автозапуск будет сброшен",
+            font=(theme.ui_font_family, 13), text_color=theme.text_secondary,
+            anchor="w", justify="left")
+        as_hint.pack(anchor="w", pady=(0, 8))
+        attach_tooltip_to_widgets([as_cb, as_hint], _TIP_AUTOSTART)
+
+    return TrayConfigFormWidgets(
+        host_var=host_var,
+        port_var=port_var,
+        dc_textbox=dc_textbox,
+        verbose_var=verbose_var,
+        adv_entries=adv_entries,
+        adv_keys=adv_keys,
+        autostart_var=autostart_var,
+    )
+
+
+def merge_adv_from_form(
+    widgets: TrayConfigFormWidgets,
+    base: Dict[str, Any],
+    default_config: dict,
+) -> None:
+    """Дополняет base значениями buf_kb / pool_size / log_max_mb (in-place)."""
+    for i, key in enumerate(widgets.adv_keys):
+        col_frame = widgets.adv_entries[i]
+        entry = col_frame.winfo_children()[1]
+        try:
+            val = float(entry.get().strip())
+            if key in ("buf_kb", "pool_size"):
+                val = int(val)
+            base[key] = val
+        except ValueError:
+            base[key] = default_config[key]
+
+
+def validate_config_form(
+    widgets: TrayConfigFormWidgets,
+    default_config: dict,
+    *,
+    include_autostart: bool,
+) -> Union[dict, str]:
+    """
+    Возвращает словарь полей конфига или строку ошибки для показа пользователю.
+    """
+    import socket as _sock
+
+    host_val = widgets.host_var.get().strip()
+    try:
+        _sock.inet_aton(host_val)
+    except OSError:
+        return "Некорректный IP-адрес."
+
+    try:
+        port_val = int(widgets.port_var.get().strip())
+        if not (1 <= port_val <= 65535):
+            raise ValueError
+    except ValueError:
+        return "Порт должен быть числом 1-65535"
+
+    lines = [
+        l.strip()
+        for l in widgets.dc_textbox.get("1.0", "end").strip().splitlines()
+        if l.strip()
+    ]
+    try:
+        tg_ws_proxy.parse_dc_ip_list(lines)
+    except ValueError as e:
+        return str(e)
+
+    new_cfg: Dict[str, Any] = {
+        "host": host_val,
+        "port": port_val,
+        "dc_ip": lines,
+        "verbose": widgets.verbose_var.get(),
+    }
+    if include_autostart:
+        new_cfg["autostart"] = (
+            widgets.autostart_var.get()
+            if widgets.autostart_var is not None
+            else False
+        )
+
+    merge_adv_from_form(widgets, new_cfg, default_config)
+    return new_cfg
+
+
+def install_tray_config_buttons(
+    ctk: Any,
+    frame: Any,
+    theme: CtkTheme,
+    *,
+    on_save: Callable[[], None],
+    on_cancel: Callable[[], None],
+) -> None:
+    btn_frame = ctk.CTkFrame(frame, fg_color="transparent")
+    btn_frame.pack(fill="x", pady=(20, 0))
+    save_btn = ctk.CTkButton(
+        btn_frame, text="Сохранить", height=38,
+        font=(theme.ui_font_family, 14, "bold"), corner_radius=10,
+        fg_color=theme.tg_blue, hover_color=theme.tg_blue_hover,
+        text_color="#ffffff",
+        command=on_save)
+    save_btn.pack(side="left", fill="x", expand=True, padx=(0, 8))
+    attach_ctk_tooltip(save_btn, _TIP_SAVE)
+    cancel_btn = ctk.CTkButton(
+        btn_frame, text="Отмена", height=38,
+        font=(theme.ui_font_family, 14), corner_radius=10,
+        fg_color=theme.field_bg, hover_color=theme.field_border,
+        text_color=theme.text_primary, border_width=1,
+        border_color=theme.field_border,
+        command=on_cancel)
+    cancel_btn.pack(side="right", fill="x", expand=True)
+    attach_ctk_tooltip(cancel_btn, _TIP_CANCEL)
+
+
+def populate_first_run_window(
+    ctk: Any,
+    root: Any,
+    theme: CtkTheme,
+    *,
+    host: str,
+    port: int,
+    on_done: Callable[[bool], None],
+) -> None:
+    """
+    Содержимое окна первого запуска. on_done(open_in_telegram) — по «Начать» и по закрытию окна.
+    """
+    tg_url = f"tg://socks?server={host}&port={port}"
+    fpx, fpy = FIRST_RUN_FRAME_PAD
+    frame = main_content_frame(ctk, root, theme, padx=fpx, pady=fpy)
+
+    title_frame = ctk.CTkFrame(frame, fg_color="transparent")
+    title_frame.pack(anchor="w", pady=(0, 16), fill="x")
+
+    accent_bar = ctk.CTkFrame(title_frame, fg_color=theme.tg_blue,
+                              width=4, height=32, corner_radius=2)
+    accent_bar.pack(side="left", padx=(0, 12))
+
+    ctk.CTkLabel(title_frame, text="Прокси запущен и работает в системном трее",
+                 font=(theme.ui_font_family, 17, "bold"),
+                 text_color=theme.text_primary).pack(side="left")
+
+    sections = [
+        ("Как подключить Telegram Desktop:", True),
+        ("  Автоматически:", True),
+        ("  ПКМ по иконке в трее → «Открыть в Telegram»", False),
+        (f"  Или ссылка: {tg_url}", False),
+        ("\n  Вручную:", True),
+        ("  Настройки → Продвинутые → Тип подключения → Прокси", False),
+        (f"  SOCKS5 → {host} : {port} (без логина/пароля)", False),
+    ]
+
+    for text, bold in sections:
+        weight = "bold" if bold else "normal"
+        ctk.CTkLabel(frame, text=text,
+                     font=(theme.ui_font_family, 13, weight),
+                     text_color=theme.text_primary,
+                     anchor="w", justify="left").pack(anchor="w", pady=1)
+
+    ctk.CTkFrame(frame, fg_color="transparent", height=16).pack()
+
+    ctk.CTkFrame(frame, fg_color=theme.field_border, height=1,
+                 corner_radius=0).pack(fill="x", pady=(0, 12))
+
+    auto_var = ctk.BooleanVar(value=True)
+    ctk.CTkCheckBox(frame, text="Открыть прокси в Telegram сейчас",
+                    variable=auto_var, font=(theme.ui_font_family, 13),
+                    text_color=theme.text_primary,
+                    fg_color=theme.tg_blue, hover_color=theme.tg_blue_hover,
+                    corner_radius=6, border_width=2,
+                    border_color=theme.field_border).pack(anchor="w", pady=(0, 16))
+
+    def on_ok():
+        on_done(auto_var.get())
+
+    ctk.CTkButton(frame, text="Начать", width=180, height=42,
+                  font=(theme.ui_font_family, 15, "bold"), corner_radius=10,
+                  fg_color=theme.tg_blue, hover_color=theme.tg_blue_hover,
+                  text_color="#ffffff",
+                  command=on_ok).pack(pady=(0, 0))
+
+    root.protocol("WM_DELETE_WINDOW", on_ok)
diff --git a/windows.py b/windows.py
index 6eaad3f..7cbba42 100644
--- a/windows.py
+++ b/windows.py
@@ -21,6 +21,20 @@ import customtkinter as ctk
 from PIL import Image, ImageDraw, ImageFont
 
 import proxy.tg_ws_proxy as tg_ws_proxy
+from ui.ctk_tray_ui import (
+    install_tray_config_buttons,
+    install_tray_config_form,
+    populate_first_run_window,
+    validate_config_form,
+)
+from ui.ctk_theme import (
+    CONFIG_DIALOG_FRAME_PAD,
+    CONFIG_DIALOG_SIZE,
+    FIRST_RUN_SIZE,
+    create_ctk_root,
+    ctk_theme_for_platform,
+    main_content_frame,
+)
 
 
 IS_FROZEN = bool(getattr(sys, "frozen", False))
@@ -351,8 +365,9 @@ def _show_info(text: str, title: str = "TG WS Proxy"):
 
 
 def _on_open_in_telegram(icon=None, item=None):
+    host = _config.get("host", DEFAULT_CONFIG["host"])
     port = _config.get("port", DEFAULT_CONFIG["port"])
-    url = f"tg://socks?server=127.0.0.1&port={port}"
+    url = f"tg://socks?server={host}&port={port}"
     log.info("Opening %s", url)
     try:
         result = webbrowser.open(url)
@@ -387,165 +402,51 @@ def _edit_config_dialog():
     cfg = dict(_config)
     cfg["autostart"] = is_autostart_enabled()
 
-    # Make sure that the autostart key is removed if autostart 
+    # Make sure that the autostart key is removed if autostart
     # is disabled, even if the executable file is moved.
     if _supports_autostart() and not cfg["autostart"]:
         set_autostart_enabled(False)
 
-    ctk.set_appearance_mode("light")
-    ctk.set_default_color_theme("blue")
-
-    root = ctk.CTk()
-    root.title("TG WS Proxy — Настройки")
-    root.resizable(False, False)
-    root.attributes("-topmost", True)
-    icon_path = str(Path(__file__).parent / "icon.ico")
-    root.iconbitmap(icon_path)
-
-    TG_BLUE = "#3390ec"
-    TG_BLUE_HOVER = "#2b7cd4"
-    BG = "#ffffff"
-    FIELD_BG = "#f0f2f5"
-    FIELD_BORDER = "#d6d9dc"
-    TEXT_PRIMARY = "#000000"
-    TEXT_SECONDARY = "#707579"
-    FONT_FAMILY = "Segoe UI"
-
-    w, h = 420, 540
-
-    if _supports_autostart(): 
+    theme = ctk_theme_for_platform()
+    w, h = CONFIG_DIALOG_SIZE
+    if _supports_autostart():
         h += 70
 
-    sw = root.winfo_screenwidth()
-    sh = root.winfo_screenheight()
-    root.geometry(f"{w}x{h}+{(sw-w)//2}+{(sh-h)//2}")
-    root.configure(fg_color=BG)
+    icon_path = str(Path(__file__).parent / "icon.ico")
 
-    frame = ctk.CTkFrame(root, fg_color=BG, corner_radius=0)
-    frame.pack(fill="both", expand=True, padx=24, pady=20)
+    root = create_ctk_root(
+        ctk,
+        title="TG WS Proxy — Настройки",
+        width=w,
+        height=h,
+        theme=theme,
+        after_create=lambda r: r.iconbitmap(icon_path),
+    )
 
-    # Host
-    ctk.CTkLabel(frame, text="IP-адрес прокси",
-                 font=(FONT_FAMILY, 13), text_color=TEXT_PRIMARY,
-                 anchor="w").pack(anchor="w", pady=(0, 4))
-    host_var = ctk.StringVar(value=cfg.get("host", "127.0.0.1"))
-    host_entry = ctk.CTkEntry(frame, textvariable=host_var, width=200, height=36,
-                              font=(FONT_FAMILY, 13), corner_radius=10,
-                              fg_color=FIELD_BG, border_color=FIELD_BORDER,
-                              border_width=1, text_color=TEXT_PRIMARY)
-    host_entry.pack(anchor="w", pady=(0, 12))
+    fpx, fpy = CONFIG_DIALOG_FRAME_PAD
+    frame = main_content_frame(ctk, root, theme, padx=fpx, pady=fpy)
 
-    # Port
-    ctk.CTkLabel(frame, text="Порт прокси",
-                 font=(FONT_FAMILY, 13), text_color=TEXT_PRIMARY,
-                 anchor="w").pack(anchor="w", pady=(0, 4))
-    port_var = ctk.StringVar(value=str(cfg.get("port", 1080)))
-    port_entry = ctk.CTkEntry(frame, textvariable=port_var, width=120, height=36,
-                              font=(FONT_FAMILY, 13), corner_radius=10,
-                              fg_color=FIELD_BG, border_color=FIELD_BORDER,
-                              border_width=1, text_color=TEXT_PRIMARY)
-    port_entry.pack(anchor="w", pady=(0, 12))
-
-    # DC-IP mappings
-    ctk.CTkLabel(frame, text="DC → IP маппинги (по одному на строку, формат DC:IP)",
-                 font=(FONT_FAMILY, 13), text_color=TEXT_PRIMARY,
-                 anchor="w").pack(anchor="w", pady=(0, 4))
-    dc_textbox = ctk.CTkTextbox(frame, width=370, height=120,
-                                font=("Consolas", 12), corner_radius=10,
-                                fg_color=FIELD_BG, border_color=FIELD_BORDER,
-                                border_width=1, text_color=TEXT_PRIMARY)
-    dc_textbox.pack(anchor="w", pady=(0, 12))
-    dc_textbox.insert("1.0", "\n".join(cfg.get("dc_ip", DEFAULT_CONFIG["dc_ip"])))
-
-    # Verbose
-    verbose_var = ctk.BooleanVar(value=cfg.get("verbose", False))
-    ctk.CTkCheckBox(frame, text="Подробное логирование (verbose)",
-                    variable=verbose_var, font=(FONT_FAMILY, 13),
-                    text_color=TEXT_PRIMARY,
-                    fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
-                    corner_radius=6, border_width=2,
-                    border_color=FIELD_BORDER).pack(anchor="w", pady=(0, 8))
-
-    # Advanced: buf_kb, pool_size, log_max_mb
-    adv_frame = ctk.CTkFrame(frame, fg_color="transparent")
-    adv_frame.pack(anchor="w", fill="x", pady=(4, 8))
-
-    for col, (lbl, key, w_) in enumerate([
-        ("Буфер (KB, 256 default)", "buf_kb", 120),
-        ("WS пулов (4 default)", "pool_size", 120),
-        ("Log size (MB, 5 def)", "log_max_mb", 120),
-    ]):
-        col_frame = ctk.CTkFrame(adv_frame, fg_color="transparent")
-        col_frame.pack(side="left", padx=(0, 10))
-        ctk.CTkLabel(col_frame, text=lbl, font=(FONT_FAMILY, 11),
-                     text_color=TEXT_SECONDARY, anchor="w").pack(anchor="w")
-        ctk.CTkEntry(col_frame, width=w_, height=30, font=(FONT_FAMILY, 12),
-                     corner_radius=8, fg_color=FIELD_BG,
-                     border_color=FIELD_BORDER, border_width=1,
-                     text_color=TEXT_PRIMARY,
-                     textvariable=ctk.StringVar(
-                         value=str(cfg.get(key, DEFAULT_CONFIG[key]))
-                     )).pack(anchor="w")
-
-    _adv_entries = list(adv_frame.winfo_children())
-    _adv_keys = ["buf_kb", "pool_size", "log_max_mb"]
-
-    autostart_var = None
-    if _supports_autostart():
-        autostart_var = ctk.BooleanVar(value=cfg["autostart"])
-        ctk.CTkCheckBox(frame, text="Автозапуск при включении Windows",
-                        variable=autostart_var, font=(FONT_FAMILY, 13),
-                        text_color=TEXT_PRIMARY,
-                        fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
-                        corner_radius=6, border_width=2,
-                        border_color=FIELD_BORDER).pack(anchor="w", pady=(0, 8))
-        ctk.CTkLabel(frame, text="При перемещении файла или открытии из другой папки\nавтозапуск будет сброшен",
-                 font=(FONT_FAMILY, 13), text_color=TEXT_SECONDARY,
-                 anchor="w", justify="left").pack(anchor="w", pady=(0, 8))
+    widgets = install_tray_config_form(
+        ctk,
+        frame,
+        theme,
+        cfg,
+        DEFAULT_CONFIG,
+        show_autostart=_supports_autostart(),
+        autostart_value=cfg.get("autostart", False),
+    )
 
     def on_save():
-        import socket as _sock
-        host_val = host_var.get().strip()
-        try:
-            _sock.inet_aton(host_val)
-        except OSError:
-            _show_error("Некорректный IP-адрес.")
+        merged = validate_config_form(
+            widgets,
+            DEFAULT_CONFIG,
+            include_autostart=_supports_autostart(),
+        )
+        if isinstance(merged, str):
+            _show_error(merged)
             return
 
-        try:
-            port_val = int(port_var.get().strip())
-            if not (1 <= port_val <= 65535):
-                raise ValueError
-        except ValueError:
-            _show_error("Порт должен быть числом 1-65535")
-            return
-
-        lines = [l.strip() for l in dc_textbox.get("1.0", "end").strip().splitlines()
-                 if l.strip()]
-        try:
-            tg_ws_proxy.parse_dc_ip_list(lines)
-        except ValueError as e:
-            _show_error(str(e))
-            return
-
-        new_cfg = {
-            "host": host_val,
-            "port": port_val,
-            "dc_ip": lines,
-            "verbose": verbose_var.get(),
-            "autostart": (autostart_var.get() if autostart_var is not None else False),
-        }
-
-        for i, key in enumerate(_adv_keys):
-            col_frame = _adv_entries[i]
-            entry = col_frame.winfo_children()[1]
-            try:
-                val = float(entry.get().strip())
-                if key in ("buf_kb", "pool_size"):
-                    val = int(val)
-                new_cfg[key] = val
-            except ValueError:
-                new_cfg[key] = DEFAULT_CONFIG[key]
+        new_cfg = merged
         save_config(new_cfg)
         _config.update(new_cfg)
         log.info("Config saved: %s", new_cfg)
@@ -555,6 +456,8 @@ def _edit_config_dialog():
 
         _tray_icon.menu = _build_menu()
 
+        # Win32 MessageBox из того же потока, что и mainloop CTk, блокирует обработку Tcl/Tk
+        # и даёт зависание; tkinter.messagebox согласован с циклом окна.
         from tkinter import messagebox
         if messagebox.askyesno("Перезапустить?",
                                "Настройки сохранены.\n\n"
@@ -568,19 +471,8 @@ def _edit_config_dialog():
     def on_cancel():
         root.destroy()
 
-    btn_frame = ctk.CTkFrame(frame, fg_color="transparent")
-    btn_frame.pack(fill="x", pady=(20, 0))
-    ctk.CTkButton(btn_frame, text="Сохранить", height=38,
-                  font=(FONT_FAMILY, 14, "bold"), corner_radius=10,
-                  fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
-                  text_color="#ffffff",
-                  command=on_save).pack(side="left", fill="x", expand=True, padx=(0, 8))
-    ctk.CTkButton(btn_frame, text="Отмена", height=38,
-                  font=(FONT_FAMILY, 14), corner_radius=10,
-                  fg_color=FIELD_BG, hover_color=FIELD_BORDER,
-                  text_color=TEXT_PRIMARY, border_width=1,
-                  border_color=FIELD_BORDER,
-                  command=on_cancel).pack(side="right", fill="x", expand=True)
+    install_tray_config_buttons(
+        ctk, frame, theme, on_save=on_save, on_cancel=on_cancel)
 
     root.mainloop()
 
@@ -618,100 +510,32 @@ def _show_first_run():
 
     host = _config.get("host", DEFAULT_CONFIG["host"])
     port = _config.get("port", DEFAULT_CONFIG["port"])
-    tg_url = f"tg://socks?server={host}&port={port}"
 
     if ctk is None:
         FIRST_RUN_MARKER.touch()
         return
 
-    ctk.set_appearance_mode("light")
-    ctk.set_default_color_theme("blue")
-
-    TG_BLUE = "#3390ec"
-    TG_BLUE_HOVER = "#2b7cd4"
-    BG = "#ffffff"
-    FIELD_BG = "#f0f2f5"
-    FIELD_BORDER = "#d6d9dc"
-    TEXT_PRIMARY = "#000000"
-    TEXT_SECONDARY = "#707579"
-    FONT_FAMILY = "Segoe UI"
-
-    root = ctk.CTk()
-    root.title("TG WS Proxy")
-    root.resizable(False, False)
-    root.attributes("-topmost", True)
+    theme = ctk_theme_for_platform()
     icon_path = str(Path(__file__).parent / "icon.ico")
-    root.iconbitmap(icon_path)
+    w, h = FIRST_RUN_SIZE
+    root = create_ctk_root(
+        ctk,
+        title="TG WS Proxy",
+        width=w,
+        height=h,
+        theme=theme,
+        after_create=lambda r: r.iconbitmap(icon_path),
+    )
 
-    w, h = 520, 440
-    sw = root.winfo_screenwidth()
-    sh = root.winfo_screenheight()
-    root.geometry(f"{w}x{h}+{(sw-w)//2}+{(sh-h)//2}")
-    root.configure(fg_color=BG)
-
-    frame = ctk.CTkFrame(root, fg_color=BG, corner_radius=0)
-    frame.pack(fill="both", expand=True, padx=28, pady=24)
-
-    title_frame = ctk.CTkFrame(frame, fg_color="transparent")
-    title_frame.pack(anchor="w", pady=(0, 16), fill="x")
-
-    # Blue accent bar
-    accent_bar = ctk.CTkFrame(title_frame, fg_color=TG_BLUE,
-                              width=4, height=32, corner_radius=2)
-    accent_bar.pack(side="left", padx=(0, 12))
-
-    ctk.CTkLabel(title_frame, text="Прокси запущен и работает в системном трее",
-                 font=(FONT_FAMILY, 17, "bold"),
-                 text_color=TEXT_PRIMARY).pack(side="left")
-
-    # Info sections
-    sections = [
-        ("Как подключить Telegram Desktop:", True),
-        ("  Автоматически:", True),
-        (f"  ПКМ по иконке в трее → «Открыть в Telegram»", False),
-        (f"  Или ссылка: {tg_url}", False),
-        ("\n  Вручную:", True),
-        ("  Настройки → Продвинутые → Тип подключения → Прокси", False),
-        (f"  SOCKS5 → {host} : {port} (без логина/пароля)", False),
-    ]
-
-    for text, bold in sections:
-        weight = "bold" if bold else "normal"
-        ctk.CTkLabel(frame, text=text,
-                     font=(FONT_FAMILY, 13, weight),
-                     text_color=TEXT_PRIMARY,
-                     anchor="w", justify="left").pack(anchor="w", pady=1)
-
-    # Spacer
-    ctk.CTkFrame(frame, fg_color="transparent", height=16).pack()
-
-    # Separator
-    ctk.CTkFrame(frame, fg_color=FIELD_BORDER, height=1,
-                 corner_radius=0).pack(fill="x", pady=(0, 12))
-
-    # Checkbox
-    auto_var = ctk.BooleanVar(value=True)
-    ctk.CTkCheckBox(frame, text="Открыть прокси в Telegram сейчас",
-                    variable=auto_var, font=(FONT_FAMILY, 13),
-                    text_color=TEXT_PRIMARY,
-                    fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
-                    corner_radius=6, border_width=2,
-                    border_color=FIELD_BORDER).pack(anchor="w", pady=(0, 16))
-
-    def on_ok():
+    def on_done(open_tg: bool):
         FIRST_RUN_MARKER.touch()
-        open_tg = auto_var.get()
         root.destroy()
         if open_tg:
             _on_open_in_telegram()
 
-    ctk.CTkButton(frame, text="Начать", width=180, height=42,
-                  font=(FONT_FAMILY, 15, "bold"), corner_radius=10,
-                  fg_color=TG_BLUE, hover_color=TG_BLUE_HOVER,
-                  text_color="#ffffff",
-                  command=on_ok).pack(pady=(0, 0))
+    populate_first_run_window(
+        ctk, root, theme, host=host, port=port, on_done=on_done)
 
-    root.protocol("WM_DELETE_WINDOW", on_ok)
     root.mainloop()