theming: respect system theme by default

Merge pull request #341 from ZoiteChat/theme_manager_get_channel_tree_palette_behavior
Use owned channel tree font for palette behavior
2026-07-09 21:39:25 +00:00 · 2026-07-09 11:01:08 -06:00 · 2026-07-09 10:57:13 -06:00 · 2026-07-09 10:38:52 -06:00 · 2026-07-08 12:24:08 -06:00
29 changed files with 937 additions and 596 deletions
--- a/.github/workflows/appimage-build.yml
+++ b/.github/workflows/appimage-build.yml
@@ -37,7 +37,6 @@ jobs:
            liblua5.4-dev libpci-dev libperl-dev libssl-dev libayatana-appindicator3-dev \
            perl python3 python3-minimal python3-dev python3-cffi mono-devel desktop-file-utils \
            fonts-noto-color-emoji breeze-gtk-theme \
-            python3-venv \
            patchelf file curl

      - name: Configure
@@ -207,10 +206,6 @@ jobs:
            export ZOITECHAT_LIBDIR="$APPDIR/usr/lib/zoitechat/plugins"
          fi

-          if [ -f "$APPDIR/usr/share/doc/zoitechat/html/index.html" ]; then
-            export ZOITECHAT_DOCDIR="$APPDIR/usr/share/doc/zoitechat/html"
-          fi
-
          if [ -d "$APPDIR/usr/share/glib-2.0/schemas" ]; then
            export GSETTINGS_SCHEMA_DIR="$APPDIR/usr/share/glib-2.0/schemas${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
          fi
--- a/.github/workflows/manjaro-package-build.yml
+++ b/.github/workflows/manjaro-package-build.yml
@@ -1,79 +0,0 @@
-name: Manjaro Package Build
-
-on:
-  push:
-    branches: [master, main]
-  pull_request:
-    branches: [master, main]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  manjaro-package:
-    runs-on: ubuntu-latest
-    container:
-      image: manjarolinux/base:latest
-
-    steps:
-      - name: Install packaging toolchain
-        run: |
-          set -euxo pipefail
-          pacman -Syu --noconfirm
-          pacman -S --noconfirm --needed \
-            base-devel \
-            git \
-            namcap \
-            meson \
-            ninja \
-            pkgconf \
-            glib2 \
-            glib2-devel \
-            gtk3 \
-            openssl \
-            libcanberra \
-            libayatana-appindicator \
-            iso-codes \
-            lua \
-            perl \
-            python \
-            python-cffi \
-            pciutils
-
-      - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-          submodules: true
-
-      - name: Build package and generate .SRCINFO (non-root)
-        run: |
-          set -euxo pipefail
-          id -u builder >/dev/null 2>&1 || useradd -m builder
-          chown -R builder:builder "$GITHUB_WORKSPACE"
-          su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --noconfirm --syncdeps --cleanbuild"
-          su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --printsrcinfo > .SRCINFO"
-
-      - name: Lint PKGBUILD and package with namcap
-        run: |
-          set -euxo pipefail
-          cd "$GITHUB_WORKSPACE/packaging/manjaro"
-          namcap PKGBUILD
-          pkg_file="$(find . -maxdepth 1 -type f -name '*.pkg.tar.*' | head -n1)"
-          namcap "$pkg_file"
-
-      - name: Collect artifacts
-        run: |
-          set -euxo pipefail
-          mkdir -p artifacts
-          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/*.pkg.tar.* artifacts/
-          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/PKGBUILD artifacts/
-          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/.SRCINFO artifacts/
-
-      - name: Upload package artifacts
-        uses: actions/upload-artifact@v6
-        with:
-          name: zoitechat-manjaro-package
-          path: artifacts/*
-          if-no-files-found: error
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -113,13 +113,6 @@ jobs:
            New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
          }

-      # Runs while Python 3.14 is still the active interpreter; the installer
-      # packages rel\offline-docs as the "Offline Documentation" component and
-      # skips it if this step could not build the docs.
-      - name: Build offline documentation
-        run: |
-          python data\misc\build_offline_docs.py --output ..\zoitechat-build\${{ matrix.platform }}\rel\offline-docs
-
      - uses: actions/setup-python@v6
        with:
          python-version: '3.8.10'
--- a/data/meson.build
+++ b/data/meson.build
@@ -6,29 +6,4 @@ if get_option('gtk-frontend')
  subdir('icons')
  subdir('misc')
  subdir('man')
-
-  # Fetch and build the offline manual so Help->Contents works without
-  # connectivity. 'auto' skips with a warning when the docs cannot be
-  # fetched (e.g. network-less distro builds, which ship docs themselves);
-  # 'enabled' makes that a hard error.
-  offline_docs_opt = get_option('offline-docs')
-  if not offline_docs_opt.disabled()
-    offline_docs_args = [
-      '--repo', get_option('offline-docs-repo'),
-      '--output', join_paths(meson.current_build_dir(), 'offline-docs'),
-      '--stamp', '@OUTPUT@',
-    ]
-    if offline_docs_opt.enabled()
-      offline_docs_args += ['--strict']
-    endif
-    custom_target('offline-docs',
-      output: 'offline-docs.stamp',
-      command: [find_program('python3'), files('misc/build_offline_docs.py')] + offline_docs_args,
-      build_by_default: true,
-    )
-    meson.add_install_script(files('misc/install_offline_docs.py'),
-      join_paths(meson.current_build_dir(), 'offline-docs'),
-      offline_docs_dir,
-    )
-  endif
 endif
--- a/data/misc/build_offline_docs.py
+++ b/data/misc/build_offline_docs.py
@@ -1,133 +0,0 @@
-#!/usr/bin/env python3
-"""Build ZoiteChat's offline HTML documentation for bundling with releases.
-
-Clones the ZoiteChat/documentation repository, preferring a tag that
-matches this source tree's version so the bundled manual matches the
-application, and builds it with Sphinx into --output. Used by the
-meson build (offline-docs option) and by the Windows CI workflow.
-
-Sphinx is installed into a throwaway virtualenv so the invoking Python
-(which the Windows build also bundles pieces of) is left untouched.
-
-Unless --strict is given, any failure prints a warning (GitHub Actions
-annotation syntax) and exits 0: builds then simply fall back to opening
-the online manual instead of failing outright.
-"""
-
-import argparse
-import pathlib
-import re
-import shutil
-import subprocess
-import sys
-import tempfile
-
-DEFAULT_REPO = "https://github.com/ZoiteChat/documentation.git"
-
-
-def project_version() -> str:
-    meson_build = pathlib.Path(__file__).resolve().parents[2] / "meson.build"
-    match = re.search(r"version\s*:\s*'([^']+)'", meson_build.read_text(encoding="utf-8"))
-    if not match:
-        raise RuntimeError(f"could not parse project version from {meson_build}")
-    return match.group(1)
-
-
-def run(argv, **kwargs) -> None:
-    print("+", " ".join(str(arg) for arg in argv), flush=True)
-    subprocess.run(argv, check=True, **kwargs)
-
-
-def clone_docs(repo: str, version: str, target: pathlib.Path) -> str:
-    # A missing tag falls through to the default branch so the docs may be
-    # newer than the app, which beats shipping none at all.
-    for ref in (f"v{version}", version, None):
-        cmd = ["git", "clone", "--depth", "1"]
-        if ref:
-            cmd += ["--branch", ref]
-        cmd += [repo, str(target)]
-        try:
-            run(cmd)
-            return ref or "default branch"
-        except subprocess.CalledProcessError:
-            shutil.rmtree(target, ignore_errors=True)
-    raise RuntimeError(f"could not clone {repo}")
-
-
-def find_source_dir(checkout: pathlib.Path) -> pathlib.Path:
-    for candidate in (checkout, checkout / "docs", checkout / "doc"):
-        if (candidate / "conf.py").is_file():
-            return candidate
-    raise RuntimeError(f"no Sphinx conf.py found in {checkout}")
-
-
-def venv_python(venv_dir: pathlib.Path) -> pathlib.Path:
-    if sys.platform == "win32":
-        return venv_dir / "Scripts" / "python.exe"
-    return venv_dir / "bin" / "python"
-
-
-def build(output: pathlib.Path, repo: str, version: str) -> None:
-    with tempfile.TemporaryDirectory(prefix="zoitechat-docs-") as tmp:
-        tmp_dir = pathlib.Path(tmp)
-        checkout = tmp_dir / "documentation"
-        html_dir = tmp_dir / "html"
-        venv_dir = tmp_dir / "venv"
-
-        ref = clone_docs(repo, version, checkout)
-        print(f"building documentation from {ref}", flush=True)
-        source_dir = find_source_dir(checkout)
-
-        run([sys.executable, "-m", "venv", str(venv_dir)])
-        python = venv_python(venv_dir)
-        requirements = source_dir / "requirements.txt"
-        if not requirements.is_file():
-            requirements = checkout / "requirements.txt"
-        if requirements.is_file():
-            run([python, "-m", "pip", "install", "--quiet", "-r", str(requirements)])
-            run([python, "-m", "pip", "install", "--quiet", "sphinx"])
-        else:
-            run([python, "-m", "pip", "install", "--quiet", "sphinx", "sphinx_rtd_theme"])
-
-        run([python, "-m", "sphinx", "-b", "html", str(source_dir), str(html_dir)])
-        if not (html_dir / "index.html").is_file():
-            raise RuntimeError("Sphinx build produced no index.html")
-
-        if output.exists():
-            shutil.rmtree(output)
-        shutil.copytree(html_dir, output,
-                        ignore=shutil.ignore_patterns(".doctrees", ".buildinfo"))
-
-    file_count = sum(1 for path in output.rglob("*") if path.is_file())
-    print(f"offline documentation staged at {output} ({file_count} files)", flush=True)
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--output", required=True, type=pathlib.Path,
-                        help="directory to stage the built HTML tree into")
-    parser.add_argument("--repo", default=DEFAULT_REPO,
-                        help="documentation git repository to build from")
-    parser.add_argument("--version", default=None,
-                        help="app version used to pick a matching docs tag "
-                             "(default: parsed from meson.build)")
-    parser.add_argument("--strict", action="store_true",
-                        help="fail on error instead of emitting a warning")
-    parser.add_argument("--stamp", type=pathlib.Path, default=None,
-                        help="file to touch on completion (meson target output)")
-    args = parser.parse_args()
-
-    try:
-        build(args.output, args.repo, args.version or project_version())
-    except Exception as error:  # noqa: BLE001 - degrade to website-only help
-        if args.strict:
-            raise
-        print(f"::warning::offline documentation not bundled: {error}", flush=True)
-
-    if args.stamp:
-        args.stamp.write_text("ok\n", encoding="utf-8")
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())
--- a/data/misc/install_offline_docs.py
+++ b/data/misc/install_offline_docs.py
@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-"""Meson install helper: copy the built offline docs into the install tree.
-
-Silently skips when the docs were not built (offline-docs=auto without
-network); Help->Contents then falls back to the online manual.
-"""
-
-import os
-import pathlib
-import shutil
-import sys
-
-src = pathlib.Path(sys.argv[1])
-dest_arg = pathlib.PurePath(sys.argv[2])
-
-if not (src / "index.html").is_file():
-    print("offline documentation was not built; skipping install")
-    sys.exit(0)
-
-if dest_arg.is_absolute():
-    # An absolute offline-docs-dir lands outside the prefix; honour DESTDIR
-    destdir = os.environ.get("DESTDIR", "")
-    dest = pathlib.Path(destdir + str(dest_arg)) if destdir else pathlib.Path(dest_arg)
-else:
-    dest = pathlib.Path(os.environ["MESON_INSTALL_DESTDIR_PREFIX"]) / dest_arg
-
-if dest.exists():
-    shutil.rmtree(dest)
-dest.parent.mkdir(parents=True, exist_ok=True)
-shutil.copytree(src, dest)
-print(f"Installed offline documentation to {dest}")
--- a/meson.build
+++ b/meson.build
@@ -35,16 +35,6 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name())
 config_h.set_quoted('GETTEXT_PACKAGE', 'zoitechat')
 config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
                                 get_option('datadir'), 'locale'))
-
-# Where Help->Contents looks for locally installed documentation before
-# falling back to the online manual. Packagers that ship the HTML docs
-# elsewhere can point this at their doc directory.
-offline_docs_dir = get_option('offline-docs-dir')
-if offline_docs_dir == ''
-  offline_docs_dir = join_paths(get_option('datadir'), 'doc', 'zoitechat', 'html')
-endif
-config_h.set_quoted('ZOITECHATDOCDIR', join_paths(get_option('prefix'), offline_docs_dir))
-
 config_h.set10('ENABLE_NLS', true)

 # Optional features
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -33,15 +33,6 @@ option('install-appdata', type: 'boolean',
 option('install-plugin-metainfo', type: 'boolean', value: false,
  description: 'Installs metainfo files for enabled plugins, useful when distros create split packages'
 )
-option('offline-docs', type: 'feature', value: 'auto',
-  description: 'Fetch, build and install the offline HTML documentation (needs network at build time); auto skips with a warning when unavailable'
-)
-option('offline-docs-dir', type: 'string', value: '',
-  description: 'Directory searched for offline HTML documentation (index.html), absolute or relative to prefix. Defaults to $datadir/doc/zoitechat/html'
-)
-option('offline-docs-repo', type: 'string', value: 'https://github.com/ZoiteChat/documentation.git',
-  description: 'Git repository the offline documentation is built from'
-)

 # Plugins
 option('with-checksum', type: 'boolean',
--- a/packaging/manjaro/PKGBUILD
+++ b/packaging/manjaro/PKGBUILD
@@ -1,69 +0,0 @@
-# Maintainer: ZoiteChat Maintainers <zoitechat@users.noreply.github.com>
-
-pkgname=zoitechat-git
-pkgver=0
-pkgrel=1
-pkgdesc='IRC client for GNOME (ZoiteChat development snapshot)'
-arch=('x86_64')
-url='https://github.com/zoitechat/zoitechat'
-license=('GPL-2.0-or-later')
-depends=(
-  'glib2'
-  'gtk3'
-  'iso-codes'
-  'libayatana-appindicator'
-  'libcanberra'
-  'lua'
-  'openssl'
-  'perl'
-  'python-cffi'
-)
-makedepends=(
-  'git'
-  'meson'
-  'ninja'
-  'pkgconf'
-  'python'
-)
-optdepends=(
-  'pciutils: sysinfo plugin hardware detection details'
-)
-provides=('zoitechat')
-conflicts=('zoitechat')
-
-_repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
-source=("zoitechat::git+file://${_repo_root}")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd "$srcdir/zoitechat"
-
-  if git describe --long --tags --abbrev=7 >/dev/null 2>&1; then
-    git describe --long --tags --abbrev=7 \
-      | sed 's/^v//' \
-      | sed -E 's/([^-]+)-([0-9]+)-g/\1.r\2.g/' \
-      | sed 's/-/./g'
-  else
-    printf '0.r%s.%s\n' \
-      "$(git rev-list --count HEAD)" \
-      "$(git rev-parse --short=7 HEAD)"
-  fi
-}
-
-build() {
-  arch-meson zoitechat build \
-    -Dtext-frontend=false \
-    -Dwith-checksum=true \
-    -Dwith-fishlim=true \
-    -Dwith-lua=lua \
-    -Dwith-perl=perl \
-    -Dwith-python=python3 \
-    -Dwith-sysinfo=true \
-    -Dinstall-plugin-metainfo=true
-
-  meson compile -C build
-}
-
-package() {
-  meson install -C build --destdir "$pkgdir"
-}
--- a/src/common/gtk3-theme-service.c
+++ b/src/common/gtk3-theme-service.c
@@ -315,6 +315,59 @@ resolve_parent_theme_root (const char *child_theme_root, const char *parent_name
 		return home_local;
 	g_free (home_local);

+	{
+		const char *xdg_data_home = g_getenv ("XDG_DATA_HOME");
+
+		if (xdg_data_home && xdg_data_home[0])
+		{
+			candidate = g_build_filename (xdg_data_home, "themes", parent_name, NULL);
+			if (path_exists_as_dir (candidate))
+				return candidate;
+			g_free (candidate);
+		}
+	}
+
+	candidate = g_build_filename (g_get_user_data_dir (), "themes", parent_name, NULL);
+	if (path_exists_as_dir (candidate))
+		return candidate;
+	g_free (candidate);
+
+	{
+		const char *xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+		guint i;
+
+		if (xdg_data_dirs && xdg_data_dirs[0])
+		{
+			char **data_dirs = g_strsplit (xdg_data_dirs, G_SEARCHPATH_SEPARATOR_S, -1);
+
+			for (i = 0; data_dirs && data_dirs[i]; i++)
+			{
+				if (!data_dirs[i][0])
+					continue;
+				candidate = g_build_filename (data_dirs[i], "themes", parent_name, NULL);
+				if (path_exists_as_dir (candidate))
+				{
+					g_strfreev (data_dirs);
+					return candidate;
+				}
+				g_free (candidate);
+			}
+			g_strfreev (data_dirs);
+		}
+		else
+		{
+			const char *const *system_data_dirs = g_get_system_data_dirs ();
+
+			for (i = 0; system_data_dirs && system_data_dirs[i]; i++)
+			{
+				candidate = g_build_filename (system_data_dirs[i], "themes", parent_name, NULL);
+				if (path_exists_as_dir (candidate))
+					return candidate;
+				g_free (candidate);
+			}
+		}
+	}
+
 	user_dir = zoitechat_gtk3_theme_service_get_user_themes_dir ();
 	candidate = g_build_filename (user_dir, parent_name, NULL);
 	g_free (user_dir);
@@ -632,18 +685,50 @@ zoitechat_gtk3_theme_service_discover (void)

 	g_mkdir_with_parents (user_dir, 0700);

-	user_data_themes = g_build_filename (g_get_user_data_dir (), "themes", NULL);
+	/* Prefer the live XDG environment over GLib's process-cached copies so
+	 * theme lookup matches what GTK resolves for the running session. */
+	{
+		const char *xdg_data_home = g_getenv ("XDG_DATA_HOME");
+
+		if (xdg_data_home && xdg_data_home[0])
+			user_data_themes = g_build_filename (xdg_data_home, "themes", NULL);
+		else
+			user_data_themes = g_build_filename (g_get_user_data_dir (), "themes", NULL);
+	}
 	add_theme_root (user_roots, seen_user_roots, user_data_themes);
 	g_free (user_data_themes);
 	add_theme_root (user_roots, seen_user_roots, home_themes);
 	add_theme_root (user_roots, seen_user_roots, user_dir);

-	system_data_dirs = g_get_system_data_dirs ();
-	for (i = 0; system_data_dirs && system_data_dirs[i]; i++)
 	{
-		char *system_themes = g_build_filename (system_data_dirs[i], "themes", NULL);
-		add_theme_root (system_roots, seen_system_roots, system_themes);
-		g_free (system_themes);
+		const char *xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+
+		if (xdg_data_dirs && xdg_data_dirs[0])
+		{
+			char **data_dirs = g_strsplit (xdg_data_dirs, G_SEARCHPATH_SEPARATOR_S, -1);
+
+			for (i = 0; data_dirs && data_dirs[i]; i++)
+			{
+				char *system_themes;
+
+				if (!data_dirs[i][0])
+					continue;
+				system_themes = g_build_filename (data_dirs[i], "themes", NULL);
+				add_theme_root (system_roots, seen_system_roots, system_themes);
+				g_free (system_themes);
+			}
+			g_strfreev (data_dirs);
+		}
+		else
+		{
+			system_data_dirs = g_get_system_data_dirs ();
+			for (i = 0; system_data_dirs && system_data_dirs[i]; i++)
+			{
+				char *system_themes = g_build_filename (system_data_dirs[i], "themes", NULL);
+				add_theme_root (system_roots, seen_system_roots, system_themes);
+				g_free (system_themes);
+			}
+		}
 	}

 	for (i = 0; i < system_roots->len; i++)
@@ -922,7 +1007,7 @@ static gboolean
 validate_theme_root_for_import (const char *theme_root, GError **error)
 {
 	char *index_theme;
-	GKeyFile *keyfile;
+	GKeyFile *keyfile = NULL;
 	char *css_dir;
 	char *css_path;
 	char *raw_inherits;
@@ -930,36 +1015,33 @@ validate_theme_root_for_import (const char *theme_root, GError **error)
 	guint i;
 	GError *load_error = NULL;

+	/* index.theme is optional for GTK3 CSS themes (GTK only needs
+	 * gtk-3.x/gtk.css), but when it is present it must be well formed so
+	 * broken archives are rejected up front. */
 	index_theme = g_build_filename (theme_root, "index.theme", NULL);
-	if (!g_file_test (index_theme, G_FILE_TEST_IS_REGULAR))
+	if (g_file_test (index_theme, G_FILE_TEST_IS_REGULAR))
 	{
-		g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
-					 "Invalid GTK3 theme at '%s': missing required index.theme at '%s'.",
-			   theme_root, index_theme);
-		g_free (index_theme);
-		return FALSE;
-	}
+		keyfile = g_key_file_new ();
+		if (!g_key_file_load_from_file (keyfile, index_theme, G_KEY_FILE_NONE, &load_error))
+		{
+			g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
+						 "Invalid GTK3 theme at '%s': failed to parse index.theme '%s': %s.",
+				   theme_root, index_theme, load_error->message);
+			g_error_free (load_error);
+			g_key_file_unref (keyfile);
+			g_free (index_theme);
+			return FALSE;
+		}

-	keyfile = g_key_file_new ();
-	if (!g_key_file_load_from_file (keyfile, index_theme, G_KEY_FILE_NONE, &load_error))
-	{
-		g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
-					 "Invalid GTK3 theme at '%s': failed to parse index.theme '%s': %s.",
-			   theme_root, index_theme, load_error->message);
-		g_error_free (load_error);
-		g_key_file_unref (keyfile);
-		g_free (index_theme);
-		return FALSE;
-	}
-
-	if (!g_key_file_has_group (keyfile, "Desktop Entry"))
-	{
-		g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
-					 "Invalid GTK3 theme at '%s': index.theme '%s' is missing the [Desktop Entry] section.",
-			   theme_root, index_theme);
-		g_key_file_unref (keyfile);
-		g_free (index_theme);
-		return FALSE;
+		if (!g_key_file_has_group (keyfile, "Desktop Entry"))
+		{
+			g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
+						 "Invalid GTK3 theme at '%s': index.theme '%s' is missing the [Desktop Entry] section.",
+				   theme_root, index_theme);
+			g_key_file_unref (keyfile);
+			g_free (index_theme);
+			return FALSE;
+		}
 	}

 	css_dir = zoitechat_gtk3_theme_pick_css_dir (theme_root);
@@ -968,7 +1050,8 @@ validate_theme_root_for_import (const char *theme_root, GError **error)
 		g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
 					 "Invalid GTK3 theme at '%s': could not resolve a GTK CSS directory (expected gtk-3.x/gtk.css).",
 					 theme_root);
-		g_key_file_unref (keyfile);
+		if (keyfile)
+			g_key_file_unref (keyfile);
 		g_free (index_theme);
 		return FALSE;
 	}
@@ -981,15 +1064,20 @@ validate_theme_root_for_import (const char *theme_root, GError **error)
 			   theme_root, css_path);
 		g_free (css_path);
 		g_free (css_dir);
-		g_key_file_unref (keyfile);
+		if (keyfile)
+			g_key_file_unref (keyfile);
 		g_free (index_theme);
 		return FALSE;
 	}
 	g_free (css_path);
 	g_free (css_dir);

-	raw_inherits = g_key_file_get_string (keyfile, "Desktop Entry", "Inherits", NULL);
-	g_key_file_unref (keyfile);
+	raw_inherits = NULL;
+	if (keyfile)
+	{
+		raw_inherits = g_key_file_get_string (keyfile, "Desktop Entry", "Inherits", NULL);
+		g_key_file_unref (keyfile);
+	}
 	g_free (index_theme);
 	if (!raw_inherits)
 		return TRUE;
--- a/src/common/tests/test-gtk3-theme-service.c
+++ b/src/common/tests/test-gtk3-theme-service.c
@@ -381,9 +381,10 @@ test_archive_without_theme_reports_css_error (void)
 	}
 	archive_path = g_build_filename (tmp_root, "invalid-theme.zip", NULL);

-	command = g_strdup_printf ("cd %s && zip -qr %s .", archive_root, archive_path);
+	command = g_strdup_printf ("sh -c \"cd '%s' && zip -qr '%s' .\"", archive_root, archive_path);
 	g_assert_true (g_spawn_command_line_sync (command, NULL, NULL, NULL, NULL));
 	g_free (command);
+	g_assert_true (g_file_test (archive_path, G_FILE_TEST_IS_REGULAR));

 	g_assert_false (zoitechat_gtk3_theme_service_import (archive_path, &imported_id, &error));
 	g_assert_null (imported_id);
@@ -397,25 +398,31 @@ test_archive_without_theme_reports_css_error (void)
 }

 static void
-test_import_rejects_theme_missing_index_theme (void)
+test_import_accepts_theme_missing_index_theme (void)
 {
 	char *tmp_root;
 	char *src_root;
 	char *theme_root;
 	char *imported_id = NULL;
 	GError *error = NULL;
+	ZoitechatGtk3Theme *found;

 	setup_test_xdir (&tmp_root);
 	src_root = g_build_filename (tmp_root, "src", NULL);
 	g_mkdir_with_parents (src_root, 0700);
 	theme_root = make_theme_dir (src_root, "NoIndex", FALSE, FALSE);

-	g_assert_false (zoitechat_gtk3_theme_service_import (theme_root, &imported_id, &error));
-	g_assert_null (imported_id);
-	g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL);
-	g_assert_nonnull (g_strstr_len (error->message, -1, "missing required index.theme"));
-	g_assert_nonnull (g_strstr_len (error->message, -1, "NoIndex"));
-	g_error_free (error);
+	/* index.theme is optional for GTK3 CSS themes: gtk-3.x/gtk.css alone
+	 * makes a loadable theme. */
+	g_assert_true (zoitechat_gtk3_theme_service_import (theme_root, &imported_id, &error));
+	g_assert_no_error (error);
+	g_assert_nonnull (imported_id);
+
+	found = zoitechat_gtk3_theme_find_by_id (imported_id);
+	g_assert_nonnull (found);
+	g_assert_true (g_str_has_suffix (found->path, "NoIndex"));
+	zoitechat_gtk3_theme_free (found);
+	g_free (imported_id);

 	g_free (theme_root);
 	g_free (src_root);
@@ -663,9 +670,10 @@ test_zip_import_nested_root (void)
 	theme = make_theme_dir (nested, "Juno-ocean", TRUE, FALSE);
 	archive_path = g_build_filename (tmp_root, "themes.zip", NULL);

-	command = g_strdup_printf ("cd %s && zip -qr %s .", zip_root, archive_path);
+	command = g_strdup_printf ("sh -c \"cd '%s' && zip -qr '%s' .\"", zip_root, archive_path);
 	g_assert_true (g_spawn_command_line_sync (command, NULL, NULL, NULL, NULL));
 	g_free (command);
+	g_assert_true (g_file_test (archive_path, G_FILE_TEST_IS_REGULAR));

 	g_assert_true (zoitechat_gtk3_theme_service_import (archive_path, &imported_id, NULL));
 	found = zoitechat_gtk3_theme_find_by_id (imported_id);
@@ -697,7 +705,7 @@ main (int argc, char **argv)
 	g_test_add_func ("/gtk3-theme-service/zip-import-nested-root", test_zip_import_nested_root);
 	g_test_add_func ("/gtk3-theme-service/invalid-archive-extract-error", test_invalid_archive_reports_extract_error);
 	g_test_add_func ("/gtk3-theme-service/archive-without-theme-css-error", test_archive_without_theme_reports_css_error);
-	g_test_add_func ("/gtk3-theme-service/import-missing-index-theme", test_import_rejects_theme_missing_index_theme);
+	g_test_add_func ("/gtk3-theme-service/import-missing-index-theme", test_import_accepts_theme_missing_index_theme);
 	g_test_add_func ("/gtk3-theme-service/import-missing-desktop-entry", test_import_rejects_index_without_desktop_entry);
 	g_test_add_func ("/gtk3-theme-service/import-unresolved-inherits", test_import_rejects_unresolved_inherits);
 	return g_test_run ();
--- a/src/fe-gtk/chanview.c
+++ b/src/fe-gtk/chanview.c
@@ -174,7 +174,7 @@ chanview_apply_theme (chanview *cv)
 	chanview_set_font_desc (cv, font);

 	theme_manager_apply_channel_tree_style (w,
-			theme_manager_get_channel_tree_palette_behavior (font));
+			theme_manager_get_channel_tree_palette_behavior (cv->font_desc));
 }

 static void
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -138,6 +138,7 @@ struct mymenu
 #define XCMENU_MARKUP 2
 #define XCMENU_MNEMONIC 4

+/* execute a userlistbutton/popupmenu command */

 static void
 nick_command (session * sess, char *cmd)
@@ -148,6 +149,7 @@ nick_command (session * sess, char *cmd)
 		handle_command (sess, cmd, TRUE);
 }

+/* fill in the %a %s %n etc and execute the command */

 void
 nick_command_parse (session *sess, char *cmd, char *nick, char *allnick)
@@ -176,6 +178,7 @@ nick_command_parse (session *sess, char *cmd, char *nick, char *allnick)
 		}
 	}

+	/* this can't overflow, since popup->cmd is only 256 */
 	len = strlen (cmd) + strlen (nick) + strlen (allnick) + 512;
 	buf = g_malloc (len);

@@ -188,6 +191,7 @@ nick_command_parse (session *sess, char *cmd, char *nick, char *allnick)
 	g_free (buf);
 }

+/* userlist button has been clicked */

 void
 userlist_button_cb (GtkWidget * button, char *cmd)
@@ -204,6 +208,7 @@ userlist_button_cb (GtkWidget * button, char *cmd)

 	if (sess->type == SESS_DIALOG)
 	{
+		/* fake a selection */
 		nicks = g_new (char *, 2);
 		nicks[0] = g_strdup (sess->channel);
 		nicks[1] = NULL;
@@ -211,6 +216,7 @@ userlist_button_cb (GtkWidget * button, char *cmd)
 	}
 	else
 	{
+		/* find number of selected rows */
 		nicks = userlist_selection_list (sess->gui->user_tree, &num_sel);
 		if (num_sel < 1)
 		{
@@ -221,6 +227,7 @@ userlist_button_cb (GtkWidget * button, char *cmd)
 		}
 	}

+	/* create "allnicks" string */
 	allnicks = g_malloc (((NICKLEN + 1) * num_sel) + 1);
 	*allnicks = 0;

@@ -234,6 +241,7 @@ userlist_button_cb (GtkWidget * button, char *cmd)
 		if (!nick)
 			nick = nicks[0];

+		/* if not using "%a", execute the command once for each nickname */
 		if (!using_allnicks)
 			nick_command_parse (sess, cmd, nicks[i], "");

@@ -257,16 +265,19 @@ userlist_button_cb (GtkWidget * button, char *cmd)
 	g_free (allnicks);
 }

+/* a popup-menu-item has been selected */

 static void
 popup_menu_cb (GtkWidget * item, char *cmd)
 {
 	char *nick;

+	/* the userdata is set in menu_quick_item() */
 	nick = g_object_get_data (G_OBJECT (item), "u");

 	if (!nick)	/* userlist popup menu */
 	{
+		/* treat it just like a userlist button */
 		userlist_button_cb (NULL, cmd);
 		return;
 	}
@@ -378,6 +389,7 @@ menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags
 	if (!name)
 		return menu;

+	/* Code to add a submenu */
 	sub_menu = menu_new ();
 	if (flags & XCMENU_MARKUP)
 	{
@@ -399,6 +411,7 @@ menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags
 		*sub_item_ret = sub_item;

 	if (flags & XCMENU_DOLIST)
+		/* We create a new element in the list */
 		submenu_list = g_slist_prepend (submenu_list, sub_menu);
 	return sub_menu;
 }
@@ -406,6 +419,7 @@ menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags
 static GtkWidget *
 menu_quick_endsub (void)
 {
+	/* Just delete the first element in the linked list pointed to by first */
 	if (submenu_list)
 		submenu_list = g_slist_remove (submenu_list, submenu_list->data);

@@ -436,7 +450,10 @@ is_in_path (char *cmd)
 	char **argv;
 	int argc;

+	/* special-case these default entries. */
+	/*                  123456789012345678 */
 	if (strncmp (prog, "gnome-terminal -x ", 18) == 0)
+	/* don't check for gnome-terminal, but the thing it's executing! */
 		prog += 18;

 	if (g_shell_parse_argv (prog, &argc, &argv, NULL))
@@ -455,6 +472,7 @@ is_in_path (char *cmd)
 	return 0;
 }

+/* syntax: "LABEL~ICON~STUFF~ADDED~LATER~" */

 static void
 menu_extract_icon (char *name, char **label, char **icon)
@@ -467,6 +485,7 @@ menu_extract_icon (char *name, char **label, char **icon)
 	{
 		if (*p == '~')
 		{
+			/* escape \~ */
 			if (p == name || p[-1] != '\\')
 			{
 				if (!start)
@@ -493,6 +512,7 @@ menu_extract_icon (char *name, char **label, char **icon)
 	}
 }

+/* append items to "menu" using the (struct popup*) list provided */

 void
 menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
@@ -519,12 +539,14 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)

 		} else if (!g_ascii_strncasecmp (pop->name, "ENDSUB", 6))
 		{
+			/* empty sub menu due to no programs in PATH? */
 			if (check_path && childcount < 1)
 				gtk_widget_destroy (subitem);
 			subitem = NULL;

 			if (tempmenu != menu)
 				tempmenu = menu_quick_endsub ();
+			/* If we get here and tempmenu equals menu that means we havent got any submenus to exit from */

 		} else if (!g_ascii_strncasecmp (pop->name, "SEP", 3))
 		{
@@ -534,8 +556,10 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
 		{
 			char *icon, *label;

+			/* default command in zoitechat.c */
 			if (pop->cmd[0] == 'n' && !strcmp (pop->cmd, "notify -n ASK %s"))
 			{
+				/* don't create this item if already in notify list */
 				if (!target || notify_is_in_list (current_sess->server, target))
 				{
 					list = list->next;
@@ -548,6 +572,7 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
 			if (!check_path || pop->cmd[0] != '!')
 			{
 				menu_quick_item (pop->cmd, label, tempmenu, 0, target, icon);
+			/* check if the program is in path, if not, leave it out! */
 			} else if (is_in_path (pop->cmd))
 			{
 				childcount++;
@@ -561,6 +586,7 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
 		list = list->next;
 	}

+	/* Let's clean up the linked list from mem */
 	while (submenu_list)
 		submenu_list = g_slist_remove (submenu_list, submenu_list->data);
 }
@@ -614,8 +640,10 @@ menu_nickinfo_cb (GtkWidget *menu, session *sess)
 	if (!is_session (sess))
 		return;

+	/* issue a /WHOIS */
 	g_snprintf (buf, sizeof (buf), "WHOIS %s %s", str_copy, str_copy);
 	handle_command (sess, buf, FALSE);
+	/* and hide the output */
 	sess->server->skip_next_whois = 1;
 }

@@ -625,6 +653,7 @@ copy_to_clipboard_cb (GtkWidget *item, char *url)
 	gtkutil_copy_to_clipboard (item, NULL, url);
 }

+/* returns boolean: Some data is missing */

 static gboolean
 menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
@@ -636,6 +665,7 @@ menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
 	gboolean missing = FALSE;
 	GtkWidget *item;

+	/* let the translators tweak this if need be */
 	fmt = _("<tt><b>%-11s</b></tt> %s");
 	g_snprintf (unknown, sizeof (unknown), "<i>%s</i>", _("Unknown"));

@@ -726,11 +756,14 @@ fe_userlist_update (session *sess, struct User *user)
 	if (!nick_submenu || !str_copy)
 		return;

+	/* not the same nick as the menu? */
 	if (sess->server->p_cmp (user->nick, str_copy))
 		return;

+	/* get rid of the "show" signal */
 	g_signal_handlers_disconnect_by_func (nick_submenu, menu_nickinfo_cb, sess);

+	/* destroy all the old items */
 	items = gtk_container_get_children (GTK_CONTAINER (nick_submenu));
 	iter = items;
 	while (iter)
@@ -741,6 +774,7 @@ fe_userlist_update (session *sess, struct User *user)
 	}
 	g_list_free (items);

+	/* and re-create them with new info */
 	needs_refresh = menu_create_nickinfo_menu (user, nick_submenu) ||
 		!user->hostname || !user->realname || !user->servername;

@@ -782,6 +816,7 @@ menu_nickmenu (session *sess, GdkEventButton *event, char *nick, int num_sel)

 	submenu_list = 0;	/* first time through, might not be 0 */

+	/* more than 1 nick selected? */
 	if (num_sel > 1)
 	{
 		g_snprintf (buf, sizeof (buf), _("%d nicks selected."), num_sel);
@@ -826,6 +861,7 @@ menu_nickmenu (session *sess, GdkEventButton *event, char *nick, int num_sel)
 	menu_popup (menu, event, NULL);
 }

+/* stuff for the View menu */

 static void
 menu_showhide_cb (session *sess)
@@ -989,6 +1025,7 @@ menu_fullscreen_toggle (GtkWidget *wid, gpointer ud)
 #ifdef WIN32
 		if (!prefs.hex_gui_win_state) /* not maximized */
 		{
+			/* other window managers seem to handle this */
 			gtk_window_resize (GTK_WINDOW (parent_window),
 				prefs.hex_gui_win_width, prefs.hex_gui_win_height);
 			gtk_window_move (GTK_WINDOW (parent_window),
@@ -1014,6 +1051,7 @@ open_url_cb (GtkWidget *item, char *url)
 {
 	char buf[512];

+	/* pass this to /URL so it can handle irc:// */
 	g_snprintf (buf, sizeof (buf), "URL %s", url);
 	handle_command (current_sess, buf, FALSE);
 }
@@ -1028,6 +1066,7 @@ menu_urlmenu (GdkEventButton *event, char *url)
 	str_copy = g_strdup (url);

 	menu = menu_new ();
+	/* more than 51 chars? Chop it */
 	if (g_utf8_strlen (str_copy, -1) >= 52)
 	{
 		tmp = g_strdup (str_copy);
@@ -1042,12 +1081,14 @@ menu_urlmenu (GdkEventButton *event, char *url)
 	}
 	menu_quick_item (0, 0, menu, XCMENU_SHADED, 0, 0);

+	/* Two hardcoded entries */
 	if (strncmp (str_copy, "irc://", 6) == 0 ||
 	    strncmp (str_copy, "ircs://",7) == 0)
 		menu_quick_item_with_callback (open_url_cb, _("Connect"), menu, str_copy);
 	else
 		menu_quick_item_with_callback (open_url_cb, _("Open Link in Browser"), menu, str_copy);
 	menu_quick_item_with_callback (copy_to_clipboard_cb, _("Copy Selected Link"), menu, str_copy);
+	/* custom ones from urlhandlers.conf */
 	menu_create (menu, urlhandler_list, str_copy, TRUE);
 	menu_add_plugin_items (menu, "\x4$URL", str_copy);
 	menu_popup (menu, event, NULL);
@@ -1315,6 +1356,7 @@ menu_newserver_tab (GtkWidget * wid, gpointer none)
 	int oldf = prefs.hex_gui_tab_newtofront;

 	prefs.hex_gui_tab_chans = 1;
+	/* force focus if setting is "only requested tabs" */
 	if (prefs.hex_gui_tab_newtofront == 2)
 		prefs.hex_gui_tab_newtofront = 1;
 	new_ircwindow (NULL, NULL, SESS_SERVER, 0);
@@ -1698,67 +1740,10 @@ menu_ctcpguiopen (void)
 	editlist_gui_open (NULL, NULL, ctcp_list, buf, "ctcpreply", "ctcpreply.conf", ctcp_help);
 }

-/* Returns the index.html of a locally installed copy of the documentation,
- * or NULL if none is available. Callers own the returned string. */
-static char *
-menu_docs_local_index (void)
-{
-	const char *env_docdir;
-	char *path;
-
-	env_docdir = g_getenv ("ZOITECHAT_DOCDIR");
-	if (env_docdir && env_docdir[0])
-	{
-		path = g_build_filename (env_docdir, "index.html", NULL);
-		if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
-			return path;
-		g_free (path);
-	}
-
-	/* Docs the user placed in the config dir; works on every platform,
-	 * including portable installs and Flatpak (host-readable, unlike /app) */
-	path = g_build_filename (get_xdir (), "offline-docs", "index.html", NULL);
-	if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
-		return path;
-	g_free (path);
-
-#ifdef WIN32
-	/* The installer's "Offline Documentation" component; ZOITECHATDOCDIR is
-	 * relative to the install dir on Windows and must not be resolved
-	 * against the CWD, which depends on how the app was launched */
-	if (!g_path_is_absolute (ZOITECHATDOCDIR))
-	{
-		char *install_dir = g_win32_get_package_installation_directory_of_module (NULL);
-
-		if (!install_dir)
-			return NULL;
-		path = g_build_filename (install_dir, ZOITECHATDOCDIR, "index.html", NULL);
-		g_free (install_dir);
-	}
-	else
-		path = g_build_filename (ZOITECHATDOCDIR, "index.html", NULL);
-#else
-	path = g_build_filename (ZOITECHATDOCDIR, "index.html", NULL);
-#endif
-	if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
-		return path;
-	g_free (path);
-
-	return NULL;
-}
-
 static void
 menu_docs (GtkWidget *wid, gpointer none)
 {
-	char *local_index = menu_docs_local_index ();
-
-	if (local_index)
-	{
-		fe_open_url (local_index);
-		g_free (local_index);
-	}
-	else
-		fe_open_url ("https://docs.zoitechat.org/en/latest/");
+	fe_open_url ("https://docs.zoitechat.org/en/latest/");
 }

 /*static void
@@ -2267,6 +2252,7 @@ menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
 	return gtk_widget_is_sensitive (widget);
 }

+/* === STUFF FOR /MENU === */

 static GtkMenuItem *
 menu_find_item (GtkWidget *menu, char *name)
@@ -2332,6 +2318,7 @@ menu_find_path (GtkWidget *menu, char *path)
 	char name[128];
 	int len;

+	/* grab the next part of the path */
 	s = strchr (path, '/');
 	len = s - path;
 	if (!s)
@@ -2385,6 +2372,7 @@ menu_foreach_gui (menu_entry *me, void (*callback) (GtkWidget *, menu_entry *, c
 			list = list->next;
 			continue;
 		}
+		/* do it only once for tab sessions, since they share a GUI */
 		if (!sess->gui->is_tab || !tabdone)
 		{
 			callback (sess->gui->menu, me, NULL);
@@ -2404,11 +2392,13 @@ menu_update_cb (GtkWidget *menu, menu_entry *me, char *target)
 	if (item)
 	{
 		gtk_widget_set_sensitive (item, me->enable);
+		/* must do it without triggering the callback */
 		if (GTK_IS_CHECK_MENU_ITEM (item))
 			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), me->state);
 	}
 }

+/* radio state changed via mouse click */
 static void
 menu_radio_cb (GtkCheckMenuItem *item, menu_entry *me)
 {
@@ -2416,12 +2406,15 @@ menu_radio_cb (GtkCheckMenuItem *item, menu_entry *me)
 	if (gtk_check_menu_item_get_active (item))
 		me->state = 1;

+	/* update the state, incase this was changed via right-click. */
+	/* This will update all other windows and menu bars */
 	menu_foreach_gui (me, menu_update_cb);

 	if (me->state && me->cmd)
 		handle_command (current_sess, me->cmd, FALSE);
 }

+/* toggle state changed via mouse click */
 static void
 menu_toggle_cb (GtkCheckMenuItem *item, menu_entry *me)
 {
@@ -2429,6 +2422,8 @@ menu_toggle_cb (GtkCheckMenuItem *item, menu_entry *me)
 	if (gtk_check_menu_item_get_active (item))
 		me->state = 1;

+	/* update the state, incase this was changed via right-click. */
+	/* This will update all other windows and menu bars */
 	menu_foreach_gui (me, menu_update_cb);

 	if (me->state)
@@ -2599,6 +2594,7 @@ fe_menu_add (menu_entry *me)
 	if (!pango_parse_markup (me->label, -1, 0, NULL, &text, NULL, NULL))
 		return NULL;

+	/* return the label with markup stripped */
 	return text;
 }

@@ -2614,6 +2610,7 @@ fe_menu_update (menu_entry *me)
 	menu_foreach_gui (me, menu_update_cb);
 }

+/* used to add custom menus to the right-click menu */

 static void
 menu_add_plugin_mainmenu_items (GtkWidget *menu)
@@ -2647,6 +2644,7 @@ menu_add_plugin_items (GtkWidget *menu, char *root, char *target)
 	}
 }

+/* === END STUFF FOR /MENU === */

 GtkWidget *
 menu_create_main (void *accel_group, int bar, int away, int toplevel,
@@ -2679,11 +2677,13 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 	else
 		menu_bar = menu_new ();

+	/* /MENU needs to know this later */
 	g_object_set_data (G_OBJECT (menu_bar), "accel", accel_group);

 	g_signal_connect (G_OBJECT (menu_bar), "can-activate-accel",
 							G_CALLBACK (menu_canacaccel), 0);

+	/* set the initial state of toggles */
 	mymenu[MENUBAR_OFFSET].state = !prefs.hex_gui_hide_menu;
 	mymenu[MENUBAR_OFFSET+1].state = prefs.hex_gui_topicbar;
 	mymenu[MENUBAR_OFFSET+2].state = !prefs.hex_gui_ulist_hide;
@@ -2722,6 +2722,7 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 		mymenu[METRE_OFFSET+3].state = 1;
 	}

+	/* change Close binding to ctrl-shift-w when using emacs keys */
 	settings = gtk_widget_get_settings (menu_bar);
 	if (settings)
 	{
@@ -2737,6 +2738,7 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 		}
 	}

+	/* Away binding to ctrl-alt-a if the _Help menu conflicts (FR/PT/IT) */
 	{
 		char *help = _("_Help");
 		char *under = strchr (help, '_');
@@ -2773,6 +2775,7 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 			if (mymenu[i].id == MENU_ID_USERMENU)
 				usermenu = menu;
 			menu_item = gtk_menu_item_new_with_mnemonic (_(mymenu[i].text));
+			/* record the English name for /menu */
 			g_object_set_data (G_OBJECT (menu_item), "name", mymenu[i].text);
 #ifdef HAVE_GTK_MAC /* Added to app menu, see below */
 			if (!bar || mymenu[i].id != MENU_ID_ZOITECHAT)		
@@ -2824,6 +2827,7 @@ normalitem:
 togitem:
 			g_object_set_data (G_OBJECT (item), "zc-key-action", (gpointer) menu_get_key_action_name (i));
 			menu_add_keybinding_accel (item, accel_group, menu_get_key_action_name (i));
+			/* must avoid callback for Radio buttons */
 			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), mymenu[i].state);
 			/*gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
 													 mymenu[i].state);*/
@@ -2863,6 +2867,7 @@ togitem:
 			group = NULL;
 			submenu = menu_new ();
 			item = create_icon_menu (_(mymenu[i].text), mymenu[i].image, TRUE);
+			/* record the English name for /menu */
 			g_object_set_data (G_OBJECT (item), "name", mymenu[i].text);
 			gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
 			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -2884,10 +2889,13 @@ togitem:
 			submenu = NULL;
 		}

+		/* record this GtkWidget * so it's state might be changed later */
 		if (mymenu[i].id != 0 && menu_widgets)
+			/* this ends up in sess->gui->menu_item[MENU_ID_XXX] */
 			menu_widgets[mymenu[i].id] = item;

 #ifdef HAVE_GTK_MAC
+		/* We want ZoiteChat to be the app menu, not including Quit or ZoiteChat itself */
 		if (bar && item && i <= CLOSE_OFFSET + 1 && mymenu[i].id != MENU_ID_ZOITECHAT)
 		{
 			if (!submenu || mymenu[i].type == M_MENUSUB)
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -1539,6 +1539,11 @@ tray_cleanup (void)
 void
 tray_apply_setup (void)
 {
+	/* Theme/setup events can be dispatched before the tray plugin has
+	 * been registered; there is nothing to (de)activate yet. */
+	if (!ph)
+		return;
+
 	if (tray_backend_active)
 	{
 		if (!prefs.hex_gui_tray)
--- a/src/fe-gtk/theme/tests/test-theme-application-input-style.c
+++ b/src/fe-gtk/theme/tests/test-theme-application-input-style.c
@@ -21,6 +21,7 @@
 #include "../../fe-gtk.h"

 #include "../theme-application.h"
+#include "../theme-policy.h"
 #include "../../maingui.h"
 #include "../../../common/zoitechat.h"
 #include "../../../common/zoitechatc.h"
@@ -54,6 +55,19 @@ theme_css_reload_input_style (gboolean enabled, const PangoFontDescription *font
 	css_reload_calls++;
 }

+gboolean
+theme_policy_system_prefers_dark (void)
+{
+	return FALSE;
+}
+
+gboolean
+theme_policy_is_dark_mode_active (unsigned int mode)
+{
+	(void) mode;
+	return FALSE;
+}
+
 void
 theme_runtime_load (void)
 {
@@ -104,7 +118,9 @@ test_invalid_font_falls_back_to_sans_11 (void)
 	g_assert_cmpint (pango_font_description_get_size (style->font_desc), ==, 11 * PANGO_SCALE);
 	g_assert_cmpint (message_calls, ==, 1);
 	g_assert_cmpint (css_reload_calls, ==, 1);
-	g_assert_true (css_enabled);
+	/* Input boxes are themed per-widget; the app-global input CSS stays
+	 * off so entries render natively under the active GTK3 theme. */
+	g_assert_false (css_enabled);
 	g_assert_nonnull (css_font_desc);

 	if (style->font_desc)
--- a/src/fe-gtk/theme/tests/test-theme-manager-auto-refresh.c
+++ b/src/fe-gtk/theme/tests/test-theme-manager-auto-refresh.c
@@ -22,6 +22,7 @@

 #include "../theme-manager.h"
 #include "../theme-gtk3.h"
+#include "../theme-policy.h"
 #include "../../../common/zoitechat.h"
 #include "../../../common/zoitechatc.h"

@@ -84,6 +85,15 @@ gboolean theme_policy_system_prefers_dark (void)
 	return stub_system_prefers_dark;
 }

+void theme_policy_init (void)
+{
+}
+
+void theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback)
+{
+	(void) callback;
+}
+
 gboolean theme_application_apply_mode (unsigned int mode, gboolean *palette_changed)
 {
 	(void) mode;
@@ -203,6 +213,7 @@ reset_state (void)
 	idle_add_calls = 0;
 	next_idle_source_id = 33;
 	prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_FOLLOW_SYSTEM;
+	prefs.hex_gui_gtk3_theme[0] = '\0';
 	test_theme_gtk3_stub_reset ();
 }

@@ -235,12 +246,14 @@ test_auto_refresh_dispatches_mode_palette_and_style_reasons (void)
 }

 static void
-test_auto_refresh_ignores_non_auto_mode (void)
+test_auto_refresh_ignores_locked_in_app_theme (void)
 {
 	guint listener_id;

 	reset_state ();
 	prefs.hex_gui_dark_mode = ZOITECHAT_DARK_MODE_DARK;
+	g_strlcpy (prefs.hex_gui_gtk3_theme, "locked-theme", sizeof (prefs.hex_gui_gtk3_theme));
+	prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_PREFER_LIGHT;
 	stub_apply_mode_palette_changed = TRUE;
 	listener_id = theme_listener_register ("auto.nonauto", auto_listener, NULL);
 	theme_manager_set_idle_add_func (immediate_idle_add);
@@ -254,6 +267,7 @@ test_auto_refresh_ignores_non_auto_mode (void)

 	theme_manager_set_idle_add_func (NULL);
 	theme_listener_unregister (listener_id);
+	prefs.hex_gui_gtk3_theme[0] = '\0';
 }

 static void
@@ -263,6 +277,7 @@ test_auto_refresh_reapplies_gtk3_for_follow_system_variant (void)

 	reset_state ();
 	prefs.hex_gui_dark_mode = ZOITECHAT_DARK_MODE_DARK;
+	g_strlcpy (prefs.hex_gui_gtk3_theme, "system-follower", sizeof (prefs.hex_gui_gtk3_theme));
 	prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_FOLLOW_SYSTEM;
 	listener_id = theme_listener_register ("auto.gtk3", auto_listener, NULL);
 	theme_manager_set_idle_add_func (immediate_idle_add);
@@ -274,6 +289,39 @@ test_auto_refresh_reapplies_gtk3_for_follow_system_variant (void)
 	g_assert_cmpint (listener_calls, ==, 0);
 	g_assert_cmpint (test_theme_gtk3_stub_apply_current_calls (), ==, 1);

+	theme_manager_set_idle_add_func (NULL);
+	theme_listener_unregister (listener_id);
+	prefs.hex_gui_gtk3_theme[0] = '\0';
+}
+
+static void
+test_auto_refresh_follows_system_theme_without_auto_mode (void)
+{
+	guint listener_id;
+
+	reset_state ();
+	prefs.hex_gui_dark_mode = ZOITECHAT_DARK_MODE_DARK;
+	prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_PREFER_LIGHT;
+	listener_id = theme_listener_register ("auto.system", auto_listener, NULL);
+	theme_manager_set_idle_add_func (immediate_idle_add);
+
+	theme_manager_refresh_auto_mode ();
+
+	/* No in-app theme is selected, so a system theme change must
+	 * re-resolve the mapped palette even outside auto dark mode. */
+	g_assert_cmpint (idle_add_calls, ==, 1);
+	g_assert_cmpint (auto_state_calls, ==, 0);
+	g_assert_cmpint (listener_calls, ==, 1);
+	g_assert_true (theme_changed_event_has_reason (&last_event, THEME_CHANGED_REASON_PALETTE));
+	g_assert_true (theme_changed_event_has_reason (&last_event, THEME_CHANGED_REASON_WIDGET_STYLE));
+	g_assert_true (theme_changed_event_has_reason (&last_event, THEME_CHANGED_REASON_USERLIST));
+	g_assert_true (theme_changed_event_has_reason (&last_event, THEME_CHANGED_REASON_MODE));
+
+	/* Unchanged system state must not dispatch again. */
+	theme_manager_refresh_auto_mode ();
+	g_assert_cmpint (idle_add_calls, ==, 2);
+	g_assert_cmpint (listener_calls, ==, 1);
+
 	theme_manager_set_idle_add_func (NULL);
 	theme_listener_unregister (listener_id);
 }
@@ -284,9 +332,11 @@ main (int argc, char **argv)
 	g_test_init (&argc, &argv, NULL);
 	g_test_add_func ("/theme/manager/auto_refresh_dispatches_mode_palette_and_style_reasons",
 			 test_auto_refresh_dispatches_mode_palette_and_style_reasons);
-	g_test_add_func ("/theme/manager/auto_refresh_ignores_non_auto_mode",
-			 test_auto_refresh_ignores_non_auto_mode);
+	g_test_add_func ("/theme/manager/auto_refresh_ignores_locked_in_app_theme",
+			 test_auto_refresh_ignores_locked_in_app_theme);
 	g_test_add_func ("/theme/manager/auto_refresh_reapplies_gtk3_for_follow_system_variant",
 			 test_auto_refresh_reapplies_gtk3_for_follow_system_variant);
+	g_test_add_func ("/theme/manager/auto_refresh_follows_system_theme_without_auto_mode",
+			 test_auto_refresh_follows_system_theme_without_auto_mode);
 	return g_test_run ();
 }
--- a/src/fe-gtk/theme/tests/test-theme-manager-dispatch-routing.c
+++ b/src/fe-gtk/theme/tests/test-theme-manager-dispatch-routing.c
@@ -23,6 +23,7 @@
 #include <string.h>

 #include "../theme-manager.h"
+#include "../theme-policy.h"
 #include "../../../common/zoitechat.h"
 #include "../../../common/zoitechatc.h"

@@ -77,6 +78,15 @@ gboolean theme_policy_system_prefers_dark (void)
 	return FALSE;
 }

+void theme_policy_init (void)
+{
+}
+
+void theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback)
+{
+	(void) callback;
+}
+
 gboolean theme_application_apply_mode (unsigned int mode, gboolean *palette_changed)
 {
 	(void) mode;
--- a/src/fe-gtk/theme/tests/test-theme-manager-policy.c
+++ b/src/fe-gtk/theme/tests/test-theme-manager-policy.c
@@ -22,6 +22,7 @@

 #include "../theme-palette.h"
 #include "../theme-manager.h"
+#include "../theme-policy.h"
 #include "../../../common/zoitechat.h"
 #include "../../../common/zoitechatc.h"

@@ -30,6 +31,7 @@ struct session *current_tab;
 struct session *lastact_sess;
 struct zoitechatprefs prefs;

+static gboolean gtk_available;
 static gboolean stub_policy_dark;
 static unsigned int stub_policy_mode;
 static gboolean stub_apply_mode_result;
@@ -79,7 +81,18 @@ void zoitechat_set_theme_post_apply_callback (zoitechat_theme_post_apply_callbac
 gboolean theme_policy_is_dark_mode_active (unsigned int mode)
 {
 	stub_policy_mode = mode;
-	return stub_policy_dark;
+	if (mode == ZOITECHAT_DARK_MODE_AUTO)
+		return stub_policy_dark;
+	return fe_dark_mode_is_enabled_for (mode);
+}
+
+void theme_policy_init (void)
+{
+}
+
+void theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback)
+{
+	(void) callback;
 }

 gboolean theme_application_apply_mode (unsigned int mode, gboolean *palette_changed)
@@ -109,11 +122,12 @@ void theme_runtime_reset_mode_colors (gboolean dark_mode)
 	(void) dark_mode;
 }

-gboolean theme_runtime_apply_mode (unsigned int mode, gboolean *dark_active)
+gboolean theme_runtime_apply_mode (unsigned int mode, gboolean *palette_changed)
 {
 	(void) mode;
-	(void) dark_active;
 	stub_apply_mode_calls++;
+	if (palette_changed)
+		*palette_changed = TRUE;
 	return TRUE;
 }

@@ -249,10 +263,11 @@ test_manager_set_token_color_routes_by_mode (void)
 	GdkRGBA color = { 0.1, 0.2, 0.3, 1.0 };
 	gboolean palette_changed = FALSE;

+	/* All edits target the single user palette; the mode argument is
+	 * accepted for compatibility but no longer selects a dark palette. */
 	reset_manager_stubs ();
 	stub_policy_dark = FALSE;
 	theme_manager_set_token_color (ZOITECHAT_DARK_MODE_LIGHT, THEME_TOKEN_MIRC_2, &color, &palette_changed);
-	g_assert_cmpint (stub_policy_mode, ==, ZOITECHAT_DARK_MODE_LIGHT);
 	g_assert_cmpint (stub_user_set_calls, ==, 1);
 	g_assert_cmpint (stub_dark_set_calls, ==, 0);
 	g_assert_cmpint (stub_apply_mode_calls, ==, 1);
@@ -262,16 +277,14 @@ test_manager_set_token_color_routes_by_mode (void)
 	reset_manager_stubs ();
 	stub_policy_dark = TRUE;
 	theme_manager_set_token_color (ZOITECHAT_DARK_MODE_DARK, THEME_TOKEN_MIRC_2, &color, &palette_changed);
-	g_assert_cmpint (stub_policy_mode, ==, ZOITECHAT_DARK_MODE_DARK);
-	g_assert_cmpint (stub_user_set_calls, ==, 0);
-	g_assert_cmpint (stub_dark_set_calls, ==, 1);
+	g_assert_cmpint (stub_user_set_calls, ==, 1);
+	g_assert_cmpint (stub_dark_set_calls, ==, 0);

 	reset_manager_stubs ();
 	stub_policy_dark = TRUE;
 	theme_manager_set_token_color (ZOITECHAT_DARK_MODE_AUTO, THEME_TOKEN_MIRC_2, &color, &palette_changed);
-	g_assert_cmpint (stub_policy_mode, ==, ZOITECHAT_DARK_MODE_AUTO);
-	g_assert_cmpint (stub_user_set_calls, ==, 0);
-	g_assert_cmpint (stub_dark_set_calls, ==, 1);
+	g_assert_cmpint (stub_user_set_calls, ==, 1);
+	g_assert_cmpint (stub_dark_set_calls, ==, 0);
 }


@@ -300,9 +313,9 @@ test_manager_set_token_color_routes_setup_indexes (void)
 		stub_policy_dark = TRUE;
 		palette_changed = FALSE;
 		theme_manager_set_token_color (ZOITECHAT_DARK_MODE_DARK, def->token, &color, &palette_changed);
-		g_assert_cmpint (stub_dark_set_calls, ==, 1);
-		g_assert_cmpint (stub_last_dark_token, ==, def->token);
-		g_assert_cmpint (stub_user_set_calls, ==, 0);
+		g_assert_cmpint (stub_user_set_calls, ==, 1);
+		g_assert_cmpint (stub_last_user_token, ==, def->token);
+		g_assert_cmpint (stub_dark_set_calls, ==, 0);
 		g_assert_true (palette_changed);
 	}
 }
@@ -345,6 +358,12 @@ test_manager_window_attach_detach_idempotence (void)
 	gulong *second_handler_ptr;
 	gulong second_handler_id;

+	if (!gtk_available)
+	{
+		g_test_message ("GTK display not available");
+		return;
+	}
+
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	g_assert_nonnull (window);

@@ -395,5 +414,6 @@ main (int argc, char **argv)
 			 test_manager_listener_registration_dispatch_and_unregister);
 	g_test_add_func ("/theme/manager/window_attach_detach_idempotence",
 			 test_manager_window_attach_detach_idempotence);
+	gtk_available = gtk_init_check (&argc, &argv);
 	return g_test_run ();
 }
--- a/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c
+++ b/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c
@@ -309,7 +309,7 @@ theme_gtk3_is_active (void)
 #include "../theme-preferences.c"

 static void
-test_removed_selected_theme_commits_fallback_and_applies (void)
+test_removed_selected_theme_falls_back_to_system_default (void)
 {
        GtkWidget *page;
        theme_preferences_ui *ui;
@@ -326,23 +326,26 @@ test_removed_selected_theme_commits_fallback_and_applies (void)
        g_strlcpy (prefs.hex_gui_gtk3_theme, "removed-theme", sizeof (prefs.hex_gui_gtk3_theme));
        prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_PREFER_DARK;
        removed_selected = FALSE;
-        apply_current_calls = 0;
-        applied_theme_id[0] = '\0';

        page = theme_preferences_create_page (NULL, &setup_prefs, NULL);
        ui = g_object_get_data (G_OBJECT (page), "theme-preferences-ui");
        g_assert_nonnull (ui);

+        apply_current_calls = 0;
+        applied_theme_id[0] = '\0';
+
        g_assert_nonnull (ui->gtk3_remove);
        gtk_button_clicked (GTK_BUTTON (ui->gtk3_remove));

-        g_assert_cmpstr (prefs.hex_gui_gtk3_theme, ==, "fallback-theme");
-        g_assert_cmpstr (setup_prefs.hex_gui_gtk3_theme, ==, "fallback-theme");
-        g_assert_cmpint (prefs.hex_gui_gtk3_variant, ==, THEME_GTK3_VARIANT_PREFER_LIGHT);
-        g_assert_cmpint (setup_prefs.hex_gui_gtk3_variant, ==, THEME_GTK3_VARIANT_PREFER_LIGHT);
+        /* Removing the active in-app theme returns to the system GTK3
+         * theme ("None") instead of forcing another theme. */
+        g_assert_cmpstr (prefs.hex_gui_gtk3_theme, ==, "");
+        g_assert_cmpstr (setup_prefs.hex_gui_gtk3_theme, ==, "");
+        g_assert_cmpint (prefs.hex_gui_gtk3_variant, ==, THEME_GTK3_VARIANT_FOLLOW_SYSTEM);
+        g_assert_cmpint (setup_prefs.hex_gui_gtk3_variant, ==, THEME_GTK3_VARIANT_FOLLOW_SYSTEM);
        g_assert_cmpint (apply_current_calls, ==, 1);
-        g_assert_cmpstr (applied_theme_id, ==, "fallback-theme");
-        g_assert_cmpint (applied_variant, ==, THEME_GTK3_VARIANT_PREFER_LIGHT);
+        g_assert_cmpstr (applied_theme_id, ==, "");
+        g_assert_cmpint (applied_variant, ==, THEME_GTK3_VARIANT_FOLLOW_SYSTEM);

        gtk_widget_destroy (page);
 }
@@ -421,8 +424,8 @@ main (int argc, char **argv)
 {
        g_test_init (&argc, &argv, NULL);
        gtk_available = gtk_init_check (&argc, &argv);
-        g_test_add_func ("/theme/preferences/gtk3_removed_selection_applies_fallback",
-                         test_removed_selected_theme_commits_fallback_and_applies);
+        g_test_add_func ("/theme/preferences/gtk3_removed_selection_falls_back_to_system",
+                         test_removed_selected_theme_falls_back_to_system_default);
        g_test_add_func ("/theme/preferences/gtk3_unset_keeps_system_default",
                         test_unset_theme_keeps_system_default_without_apply);
        g_test_add_func ("/theme/preferences/gtk3_select_none_resets_theme",
--- a/src/fe-gtk/theme/tests/test-theme-runtime-persistence.c
+++ b/src/fe-gtk/theme/tests/test-theme-runtime-persistence.c
@@ -290,12 +290,12 @@ test_ui_edits_persist_without_legacy_array_mutation (void)
 	theme_runtime_save ();

 	theme_runtime_load ();
-	theme_runtime_apply_mode (ZOITECHAT_DARK_MODE_LIGHT, NULL);
+	theme_runtime_apply_dark_mode (FALSE);
 	g_assert_true (theme_runtime_get_color (THEME_TOKEN_SELECTION_FOREGROUND, &light_loaded));
 	g_assert_true (gdk_rgba_parse (&light_expected, "#224466"));
 	g_assert_true (colors_equal (&light_loaded, &light_expected));

-	theme_runtime_apply_mode (ZOITECHAT_DARK_MODE_DARK, NULL);
+	theme_runtime_apply_dark_mode (TRUE);
 	g_assert_true (theme_runtime_get_color (THEME_TOKEN_SELECTION_FOREGROUND, &dark_loaded));
 	g_assert_true (gdk_rgba_parse (&dark_expected, "#88aacc"));
 	g_assert_true (colors_equal (&dark_loaded, &dark_expected));
--- a/src/fe-gtk/theme/theme-access.c
+++ b/src/fe-gtk/theme/theme-access.c
@@ -21,7 +21,6 @@
 #include "theme-access.h"

 #include "theme-runtime.h"
-#include "theme-gtk3.h"



@@ -32,7 +31,8 @@ enum
 	THEME_XTEXT_MARK_BG_INDEX = 100,
 	THEME_XTEXT_FG_INDEX = 101,
 	THEME_XTEXT_BG_INDEX = 102,
-	THEME_XTEXT_MARKER_INDEX = 103
+	THEME_XTEXT_MARKER_INDEX = 103,
+	THEME_XTEXT_MARKER_LEGACY_INDEX = 36
 };

 static const guint8 theme_default_99_mirc_colors[THEME_XTEXT_MIRC_COLS][3] = {
@@ -111,14 +111,49 @@ theme_access_context_get_background_color (GtkStyleContext *context, GtkStateFla
 	gtk_style_context_restore (context);
 }

+static gboolean
+theme_access_lookup_named_color (GtkStyleContext *context, const char *const *names, GdkRGBA *out_color)
+{
+	size_t i;
+
+	for (i = 0; names[i] != NULL; i++)
+	{
+		if (gtk_style_context_lookup_color (context, names[i], out_color))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void
+theme_access_resolve_map_background (GtkStyleContext *context, GtkStateFlags state,
+				     const char *const *named_fallbacks, GdkRGBA *out_color)
+{
+	GdkRGBA named;
+
+	theme_access_context_get_background_color (context, state, out_color);
+	if (out_color->alpha > 0.0)
+		return;
+
+	/* Unstyled CSS nodes (e.g. the custom chat text widget) report a fully
+	 * transparent background; fall back to the theme's named colors so the
+	 * mapped palette still follows the active GTK3 theme. */
+	if (theme_access_lookup_named_color (context, named_fallbacks, &named))
+		*out_color = named;
+}
+
 static gboolean
 theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map)
 {
+	static const char *const base_fallbacks[] = { "theme_base_color", "theme_bg_color", NULL };
+	static const char *const selected_bg_fallbacks[] = { "theme_selected_bg_color", NULL };
+	static const char *const selected_fg_fallbacks[] = { "theme_selected_fg_color", NULL };
 	GtkStyleContext *context;
+	GdkRGBA named;
 	GdkRGBA accent;

 	g_return_val_if_fail (out_map != NULL, FALSE);
-	if (!theme_gtk3_is_active () || widget == NULL || !GTK_IS_WIDGET (widget))
+	if (widget == NULL || !GTK_IS_WIDGET (widget))
 		return FALSE;

 	context = gtk_widget_get_style_context (widget);
@@ -126,9 +161,14 @@ theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map
 		return FALSE;

 	theme_access_context_get_color (context, GTK_STATE_FLAG_NORMAL, &out_map->text_foreground);
-	theme_access_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &out_map->text_background);
+	theme_access_resolve_map_background (context, GTK_STATE_FLAG_NORMAL, base_fallbacks,
+					     &out_map->text_background);
 	theme_access_context_get_color (context, GTK_STATE_FLAG_SELECTED, &out_map->selection_foreground);
-	theme_access_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &out_map->selection_background);
+	theme_access_resolve_map_background (context, GTK_STATE_FLAG_SELECTED, selected_bg_fallbacks,
+					     &out_map->selection_background);
+	if (gdk_rgba_equal (&out_map->selection_foreground, &out_map->text_foreground) &&
+	    theme_access_lookup_named_color (context, selected_fg_fallbacks, &named))
+		out_map->selection_foreground = named;
 	theme_access_context_get_color (context, GTK_STATE_FLAG_LINK, &accent);
 	if (accent.alpha <= 0.0)
 		accent = out_map->selection_background;
@@ -223,14 +263,35 @@ theme_get_xtext_colors (XTextColor *palette, size_t palette_len)
 void
 theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_t palette_len)
 {
+	ThemeGtkPaletteMap gtk_map = { 0 };
 	ThemeWidgetStyleValues style_values;
 	GdkRGBA marker_color;
+	gboolean have_marker = FALSE;

 	if (!palette)
 		return;

-	theme_get_widget_style_values_for_widget (widget, &style_values);
-	theme_runtime_get_xtext_colors (palette, palette_len);
+	if (theme_access_get_gtk_palette_map (widget, &gtk_map))
+	{
+		theme_runtime_get_widget_style_values_mapped (&gtk_map, &style_values);
+		theme_runtime_get_xtext_colors_mapped (&gtk_map, palette, palette_len);
+	}
+	else
+	{
+		theme_runtime_get_widget_style_values (&style_values);
+		theme_runtime_get_xtext_colors (palette, palette_len);
+	}
+	if (palette_len > THEME_XTEXT_MARKER_LEGACY_INDEX)
+	{
+		/* The marker token lives at its legacy slot before the extended
+		 * mIRC palette overwrites it; keep the (possibly theme-mapped)
+		 * value for the dedicated marker index below. */
+		marker_color.red = palette[THEME_XTEXT_MARKER_LEGACY_INDEX].red;
+		marker_color.green = palette[THEME_XTEXT_MARKER_LEGACY_INDEX].green;
+		marker_color.blue = palette[THEME_XTEXT_MARKER_LEGACY_INDEX].blue;
+		marker_color.alpha = palette[THEME_XTEXT_MARKER_LEGACY_INDEX].alpha;
+		have_marker = TRUE;
+	}
 	if (palette_len >= THEME_XTEXT_MIRC_COLS)
 		theme_access_apply_default_99_palette (palette, palette_len);
 	if (palette_len > THEME_XTEXT_MARK_FG_INDEX)
@@ -249,7 +310,7 @@ theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_
 	}
 	if (palette_len > THEME_XTEXT_MARKER_INDEX)
 	{
-		if (!theme_runtime_get_color (THEME_TOKEN_MARKER, &marker_color))
+		if (!have_marker && !theme_runtime_get_color (THEME_TOKEN_MARKER, &marker_color))
 			marker_color = style_values.selection_background;
 		palette[THEME_XTEXT_MARKER_INDEX].red = marker_color.red;
 		palette[THEME_XTEXT_MARKER_INDEX].green = marker_color.green;
--- a/src/fe-gtk/theme/theme-application.c
+++ b/src/fe-gtk/theme/theme-application.c
@@ -25,6 +25,7 @@
 #include "theme-css.h"
 #include "theme-runtime.h"
 #include "theme-gtk3.h"
+#include "theme-policy.h"
 #include "../maingui.h"
 #include <gtk/gtk.h>

@@ -59,6 +60,16 @@ theme_application_apply_toplevel_theme (gboolean dark)
 			prefer_dark = TRUE;
 		else if (prefs.hex_gui_gtk3_variant == THEME_GTK3_VARIANT_PREFER_LIGHT)
 			prefer_dark = FALSE;
+		else
+			prefer_dark = theme_policy_system_prefers_dark ();
+	}
+	else
+	{
+		/* Following the system GTK3 theme: only request the dark
+		 * variant when the dark-mode preference (or the system, in
+		 * auto mode) asks for it, instead of clobbering the value
+		 * that came from the user's GTK configuration. */
+		prefer_dark = theme_policy_is_dark_mode_active (prefs.hex_gui_dark_mode);
 	}

 	if (settings && g_object_class_find_property (G_OBJECT_GET_CLASS (settings),
--- a/src/fe-gtk/theme/theme-css.c
+++ b/src/fe-gtk/theme/theme-css.c
@@ -29,8 +29,6 @@
 static const char *theme_css_selector_input = "#zoitechat-inputbox";
 static const char *theme_css_selector_input_text = "#zoitechat-inputbox text";
 static const char *theme_css_selector_palette_class = "zoitechat-palette";
-static const char *theme_css_selector_dark_class = "zoitechat-dark";
-static const char *theme_css_selector_light_class = "zoitechat-light";
 static const char *theme_css_palette_provider_key = "zoitechat-palette-provider";
 static const guint theme_css_provider_priority = GTK_STYLE_PROVIDER_PRIORITY_USER;
 static const char *theme_css_palette_scope_selectors =
@@ -362,61 +360,9 @@ theme_css_apply_palette_widget (GtkWidget *widget, const GdkRGBA *bg, const GdkR
 char *
 theme_css_build_toplevel_classes (void)
 {
-	return g_strdup_printf (
-		"window.%s, window.%s:backdrop, .%s {"
-		"background-color: #202020;"
-		"color: #f0f0f0;"
-		"border-color: #202020;"
-		"}"
-		"window.%s menubar, window.%s menubar:backdrop, window.%s menubar box, window.%s menubar box:backdrop, window.%s menuitem, window.%s menuitem:backdrop {"
-		"background-color: @theme_bg_color;"
-		"background-image: none;"
-		"color: @theme_fg_color;"
-		"border-color: @theme_bg_color;"
-		"}"
-		"window.%s menuitem:hover, window.%s menuitem:selected {"
-		"background-color: @theme_selected_bg_color;"
-		"background-image: none;"
-		"color: @theme_selected_fg_color;"
-		"border-color: @theme_selected_bg_color;"
-		"}"
-		"window.%s, window.%s:backdrop, .%s {"
-		"background-color: #f6f6f6;"
-		"color: #101010;"
-		"border-color: #f6f6f6;"
-		"}"
-		"window.%s menubar, window.%s menubar:backdrop, window.%s menubar box, window.%s menubar box:backdrop, window.%s menuitem, window.%s menuitem:backdrop {"
-		"background-color: @theme_bg_color;"
-		"background-image: none;"
-		"color: @theme_fg_color;"
-		"border-color: @theme_bg_color;"
-		"}"
-		"window.%s menuitem:hover, window.%s menuitem:selected {"
-		"background-color: @theme_selected_bg_color;"
-		"background-image: none;"
-		"color: @theme_selected_fg_color;"
-		"border-color: @theme_selected_bg_color;"
-		"}",
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class);
+	/* Windows, dialogs and menus must render with the colors of the active
+	 * GTK3 theme (system or in-app selected).  zoitechat-dark and
+	 * zoitechat-light are marker classes only; painting fixed colors here
+	 * overrides every theme (issue #334). */
+	return g_strdup ("");
 }
--- a/src/fe-gtk/theme/theme-manager.c
+++ b/src/fe-gtk/theme/theme-manager.c
@@ -58,10 +58,52 @@ typedef struct
 	gboolean resolved_dark_preference;
 	char gtk3_theme_id[sizeof prefs.hex_gui_gtk3_theme];
 	int gtk3_variant;
+	char *gtk_theme_name;
 } ThemeManagerAutoRefreshCache;

 static ThemeManagerAutoRefreshCache theme_manager_auto_refresh_cache;

+static void
+theme_manager_auto_refresh_cache_reset (void)
+{
+	g_free (theme_manager_auto_refresh_cache.gtk_theme_name);
+	memset (&theme_manager_auto_refresh_cache, 0, sizeof (theme_manager_auto_refresh_cache));
+}
+
+static void
+theme_manager_auto_refresh_cache_store (gboolean resolved_dark_preference, char *gtk_theme_name)
+{
+	theme_manager_auto_refresh_cache.initialized = TRUE;
+	theme_manager_auto_refresh_cache.resolved_dark_preference = resolved_dark_preference;
+	theme_manager_auto_refresh_cache.gtk3_variant = prefs.hex_gui_gtk3_variant;
+	g_strlcpy (theme_manager_auto_refresh_cache.gtk3_theme_id,
+		   prefs.hex_gui_gtk3_theme,
+		   sizeof (theme_manager_auto_refresh_cache.gtk3_theme_id));
+	g_free (theme_manager_auto_refresh_cache.gtk_theme_name);
+	theme_manager_auto_refresh_cache.gtk_theme_name = gtk_theme_name;
+}
+
+static char *
+theme_manager_dup_gtk_theme_name (void)
+{
+	GtkSettings *settings = gtk_settings_get_default ();
+	char *gtk_theme_name = NULL;
+
+	if (settings)
+		g_object_get (settings, "gtk-theme-name", &gtk_theme_name, NULL);
+	return gtk_theme_name;
+}
+
+/* Record the state the application started up with so that the first queued
+ * auto refresh only reacts to real changes; startup already applied the
+ * current theme, and consumers such as the tray are not ready yet. */
+static void
+theme_manager_auto_refresh_cache_prime (void)
+{
+	theme_manager_auto_refresh_cache_store (theme_policy_system_prefers_dark (),
+						theme_manager_dup_gtk_theme_name ());
+}
+
 static void theme_manager_apply_platform_window_theme (GtkWidget *window);

 static void
@@ -145,7 +187,9 @@ theme_manager_auto_dark_mode_changed (GtkSettings *settings, GParamSpec *pspec,
 	gboolean color_change = FALSE;
 	gboolean should_refresh_gtk3;
 	gboolean gtk3_refresh;
+	gboolean follows_system_theme;
 	gboolean resolved_dark_preference;
+	char *gtk_theme_name = NULL;
 	static gboolean in_handler = FALSE;

 	(void) settings;
@@ -154,39 +198,47 @@ theme_manager_auto_dark_mode_changed (GtkSettings *settings, GParamSpec *pspec,

 	resolved_dark_preference = theme_policy_system_prefers_dark ();
 	gtk3_refresh = theme_manager_should_refresh_gtk3 ();
+	follows_system_theme = prefs.hex_gui_gtk3_theme[0] == '\0';
 	should_refresh_gtk3 = gtk3_refresh || prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO;

+	gtk_theme_name = theme_manager_dup_gtk_theme_name ();
+
 	if (theme_manager_auto_refresh_cache.initialized &&
 	    theme_manager_auto_refresh_cache.resolved_dark_preference == resolved_dark_preference &&
 	    theme_manager_auto_refresh_cache.gtk3_variant == prefs.hex_gui_gtk3_variant &&
-	    g_strcmp0 (theme_manager_auto_refresh_cache.gtk3_theme_id, prefs.hex_gui_gtk3_theme) == 0)
+	    g_strcmp0 (theme_manager_auto_refresh_cache.gtk3_theme_id, prefs.hex_gui_gtk3_theme) == 0 &&
+	    g_strcmp0 (theme_manager_auto_refresh_cache.gtk_theme_name, gtk_theme_name) == 0)
+	{
+		g_free (gtk_theme_name);
 		return;
+	}

-	theme_manager_auto_refresh_cache.initialized = TRUE;
-	theme_manager_auto_refresh_cache.resolved_dark_preference = resolved_dark_preference;
-	theme_manager_auto_refresh_cache.gtk3_variant = prefs.hex_gui_gtk3_variant;
-	g_strlcpy (theme_manager_auto_refresh_cache.gtk3_theme_id,
-		   prefs.hex_gui_gtk3_theme,
-		   sizeof (theme_manager_auto_refresh_cache.gtk3_theme_id));
+	theme_manager_auto_refresh_cache_store (resolved_dark_preference, gtk_theme_name);

-	if (prefs.hex_gui_dark_mode != ZOITECHAT_DARK_MODE_AUTO && !gtk3_refresh)
+	if (prefs.hex_gui_dark_mode != ZOITECHAT_DARK_MODE_AUTO && !gtk3_refresh && !follows_system_theme)
 		return;
 	if (in_handler)
 		return;

 	in_handler = TRUE;

-	if (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO)
+	if (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO || follows_system_theme)
 	{
-		fe_set_auto_dark_mode_state (resolved_dark_preference);
 		theme_manager_commit_preferences (prefs.hex_gui_dark_mode, &color_change);
-		if (color_change)
-			theme_manager_dispatch_changed (THEME_CHANGED_REASON_PALETTE | THEME_CHANGED_REASON_WIDGET_STYLE | THEME_CHANGED_REASON_USERLIST | THEME_CHANGED_REASON_MODE);
+		if (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO)
+			fe_set_auto_dark_mode_state (resolved_dark_preference);
 	}

 	if (should_refresh_gtk3)
 		theme_gtk3_apply_current (NULL);

+	if (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO || follows_system_theme)
+	{
+		/* The system theme feeds the mapped palette (chat area, user
+		 * list, channel tree), so consumers must re-resolve colors. */
+		theme_manager_dispatch_changed (THEME_CHANGED_REASON_PALETTE | THEME_CHANGED_REASON_WIDGET_STYLE | THEME_CHANGED_REASON_USERLIST | THEME_CHANGED_REASON_MODE);
+	}
+
 	in_handler = FALSE;
 }

@@ -204,18 +256,28 @@ theme_manager_run_auto_refresh (gpointer data)
 static void
 theme_manager_queue_auto_refresh (GtkSettings *settings, GParamSpec *pspec, gpointer data)
 {
+	guint source_id;
+
 	(void) settings;
 	(void) pspec;

 	if (theme_manager_auto_refresh_source != 0)
 		return;

-	theme_manager_auto_refresh_source = theme_manager_idle_add_func (theme_manager_run_auto_refresh, data);
+	theme_manager_auto_refresh_source = 1;
+	source_id = theme_manager_idle_add_func (theme_manager_run_auto_refresh, data);
+	/* An injected idle-add may run the refresh synchronously and already
+	 * have cleared the pending marker; only keep the id while pending. */
+	if (theme_manager_auto_refresh_source != 0)
+		theme_manager_auto_refresh_source = source_id;
 }

 void
 theme_manager_init (void)
 {
+	static gboolean settings_signals_connected = FALSE;
+	GtkSettings *settings;
+
 	if (!theme_manager_listeners)
 		theme_manager_listeners = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL,
 									 theme_listener_free);
@@ -223,10 +285,25 @@ theme_manager_init (void)
 	if (!theme_manager_setup_listener_id)
 		theme_manager_setup_listener_id = theme_listener_register ("setup.apply", theme_manager_setup_apply_listener, NULL);

-	fe_set_auto_dark_mode_state (FALSE);
+	theme_policy_init ();
+	theme_policy_set_appearance_changed_callback (theme_manager_refresh_auto_mode);
+
+	settings = gtk_settings_get_default ();
+	if (settings && !settings_signals_connected)
+	{
+		g_signal_connect (settings, "notify::gtk-theme-name",
+				  G_CALLBACK (theme_manager_queue_auto_refresh), NULL);
+		g_signal_connect (settings, "notify::gtk-application-prefer-dark-theme",
+				  G_CALLBACK (theme_manager_queue_auto_refresh), NULL);
+		settings_signals_connected = TRUE;
+	}
+
+	fe_set_auto_dark_mode_state (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO ?
+				     theme_policy_system_prefers_dark () : FALSE);
 	theme_application_apply_mode (prefs.hex_gui_dark_mode, NULL);
 	theme_gtk3_init ();
 	zoitechat_set_theme_post_apply_callback (theme_manager_handle_theme_applied);
+	theme_manager_auto_refresh_cache_prime ();
 }

 gboolean
@@ -519,7 +596,7 @@ theme_manager_apply_platform_window_theme (GtkWidget *window)
 			dark = theme_policy_system_prefers_dark ();
 	}
 	else
-		dark = theme_runtime_is_dark_active ();
+		dark = theme_policy_is_dark_mode_active (prefs.hex_gui_dark_mode);
 	if (context)
 	{
 		gtk_style_context_remove_class (context, "zoitechat-dark");
@@ -712,4 +789,5 @@ theme_manager_set_idle_add_func (ThemeManagerIdleAddFunc idle_add_func)
 {
 	theme_manager_idle_add_func = idle_add_func ? idle_add_func : g_idle_add;
 	theme_manager_auto_refresh_source = 0;
+	theme_manager_auto_refresh_cache_reset ();
 }
--- a/src/fe-gtk/theme/theme-policy.c
+++ b/src/fe-gtk/theme/theme-policy.c
@@ -20,14 +20,379 @@

 #include "theme-policy.h"

+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+
+#include "theme-gtk3.h"
 #include "../fe-gtk.h"
 #include "../../common/zoitechat.h"
 #include "../../common/zoitechatc.h"

+/* org.freedesktop.appearance color-scheme values (XDG desktop portal) */
+enum
+{
+	THEME_POLICY_COLOR_SCHEME_NO_PREFERENCE = 0,
+	THEME_POLICY_COLOR_SCHEME_PREFER_DARK = 1,
+	THEME_POLICY_COLOR_SCHEME_PREFER_LIGHT = 2
+};
+
+static ThemePolicyAppearanceChangedFunc policy_appearance_changed_cb;
+
+/* GtkSettings state captured before ZoiteChat writes to it, so that values
+ * coming from the user's own GTK configuration are not mistaken for values
+ * this application set. */
+static gboolean policy_initial_gtk_state_captured;
+static gboolean policy_initial_prefer_dark;
+static char *policy_initial_theme_name;
+
+#ifndef G_OS_WIN32
+static gboolean policy_portal_watch_started;
+static gboolean policy_portal_value_valid;
+static guint32 policy_portal_color_scheme;
+
+static gboolean policy_gsettings_checked;
+static GSettings *policy_gsettings_interface;
+#endif
+
+static void
+policy_capture_initial_gtk_state (void)
+{
+	GtkSettings *settings;
+
+	if (policy_initial_gtk_state_captured)
+		return;
+
+	settings = gtk_settings_get_default ();
+	if (!settings)
+		return;
+
+	g_object_get (settings,
+	              "gtk-application-prefer-dark-theme", &policy_initial_prefer_dark,
+	              "gtk-theme-name", &policy_initial_theme_name,
+	              NULL);
+	policy_initial_gtk_state_captured = TRUE;
+}
+
+static gboolean
+policy_theme_name_is_dark (const char *name)
+{
+	char *lower;
+	gboolean dark;
+
+	if (!name || !name[0])
+		return FALSE;
+
+	lower = g_ascii_strdown (name, -1);
+	dark = strstr (lower, "dark") != NULL || strstr (lower, "noir") != NULL ||
+	       strstr (lower, "black") != NULL;
+	g_free (lower);
+	return dark;
+}
+
+#ifndef G_OS_WIN32
+
+static void
+policy_notify_appearance_changed (void)
+{
+	if (policy_appearance_changed_cb)
+		policy_appearance_changed_cb ();
+}
+
+static gboolean
+policy_color_scheme_from_variant (GVariant *value, guint32 *color_scheme)
+{
+	GVariant *inner;
+	gboolean ok = FALSE;
+
+	if (!value || !color_scheme)
+		return FALSE;
+
+	inner = g_variant_ref (value);
+	while (g_variant_is_of_type (inner, G_VARIANT_TYPE_VARIANT))
+	{
+		GVariant *unwrapped = g_variant_get_variant (inner);
+
+		g_variant_unref (inner);
+		inner = unwrapped;
+	}
+
+	if (g_variant_is_of_type (inner, G_VARIANT_TYPE_UINT32))
+	{
+		*color_scheme = g_variant_get_uint32 (inner);
+		ok = TRUE;
+	}
+
+	g_variant_unref (inner);
+	return ok;
+}
+
+static void
+policy_portal_store_color_scheme (guint32 color_scheme)
+{
+	gboolean changed;
+
+	changed = !policy_portal_value_valid || policy_portal_color_scheme != color_scheme;
+	policy_portal_value_valid = TRUE;
+	policy_portal_color_scheme = color_scheme;
+
+	if (changed)
+		policy_notify_appearance_changed ();
+}
+
+static void
+policy_portal_setting_changed_cb (GDBusConnection *connection, const char *sender_name,
+                                  const char *object_path, const char *interface_name,
+                                  const char *signal_name, GVariant *parameters,
+                                  gpointer user_data)
+{
+	const char *setting_namespace = NULL;
+	const char *setting_key = NULL;
+	GVariant *value = NULL;
+	guint32 color_scheme = THEME_POLICY_COLOR_SCHEME_NO_PREFERENCE;
+
+	(void) connection;
+	(void) sender_name;
+	(void) object_path;
+	(void) interface_name;
+	(void) signal_name;
+	(void) user_data;
+
+	if (!parameters || !g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(ssv)")))
+		return;
+
+	g_variant_get (parameters, "(&s&sv)", &setting_namespace, &setting_key, &value);
+	if (g_strcmp0 (setting_namespace, "org.freedesktop.appearance") == 0 &&
+	    g_strcmp0 (setting_key, "color-scheme") == 0 &&
+	    policy_color_scheme_from_variant (value, &color_scheme))
+		policy_portal_store_color_scheme (color_scheme);
+
+	if (value)
+		g_variant_unref (value);
+}
+
+static void
+policy_portal_read_ready_cb (GObject *source, GAsyncResult *result, gpointer user_data)
+{
+	GVariant *reply;
+	GVariant *value = NULL;
+	guint32 color_scheme = THEME_POLICY_COLOR_SCHEME_NO_PREFERENCE;
+
+	(void) user_data;
+
+	reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, NULL);
+	if (!reply)
+		return;
+
+	if (g_variant_is_of_type (reply, G_VARIANT_TYPE ("(v)")))
+	{
+		g_variant_get (reply, "(v)", &value);
+		if (policy_color_scheme_from_variant (value, &color_scheme))
+			policy_portal_store_color_scheme (color_scheme);
+		if (value)
+			g_variant_unref (value);
+	}
+
+	g_variant_unref (reply);
+}
+
+static void
+policy_portal_bus_ready_cb (GObject *source, GAsyncResult *result, gpointer user_data)
+{
+	GDBusConnection *connection;
+
+	(void) source;
+	(void) user_data;
+
+	connection = g_bus_get_finish (result, NULL);
+	if (!connection)
+		return;
+
+	g_dbus_connection_signal_subscribe (connection,
+	                                    "org.freedesktop.portal.Desktop",
+	                                    "org.freedesktop.portal.Settings",
+	                                    "SettingChanged",
+	                                    "/org/freedesktop/portal/desktop",
+	                                    NULL,
+	                                    G_DBUS_SIGNAL_FLAGS_NONE,
+	                                    policy_portal_setting_changed_cb,
+	                                    NULL,
+	                                    NULL);
+
+	g_dbus_connection_call (connection,
+	                        "org.freedesktop.portal.Desktop",
+	                        "/org/freedesktop/portal/desktop",
+	                        "org.freedesktop.portal.Settings",
+	                        "Read",
+	                        g_variant_new ("(ss)", "org.freedesktop.appearance", "color-scheme"),
+	                        G_VARIANT_TYPE ("(v)"),
+	                        G_DBUS_CALL_FLAGS_NONE,
+	                        3000,
+	                        NULL,
+	                        policy_portal_read_ready_cb,
+	                        NULL);
+	g_object_unref (connection);
+}
+
+static void
+policy_portal_watch_start (void)
+{
+	if (policy_portal_watch_started)
+		return;
+
+	policy_portal_watch_started = TRUE;
+	g_bus_get (G_BUS_TYPE_SESSION, NULL, policy_portal_bus_ready_cb, NULL);
+}
+
+static void
+policy_gsettings_changed_cb (GSettings *settings, const char *key, gpointer user_data)
+{
+	(void) settings;
+	(void) key;
+	(void) user_data;
+
+	policy_notify_appearance_changed ();
+}
+
+static GSettings *
+policy_get_interface_gsettings (void)
+{
+	GSettingsSchemaSource *source;
+	GSettingsSchema *schema;
+	gboolean has_key;
+
+	if (policy_gsettings_checked)
+		return policy_gsettings_interface;
+
+	policy_gsettings_checked = TRUE;
+
+	source = g_settings_schema_source_get_default ();
+	if (!source)
+		return NULL;
+
+	schema = g_settings_schema_source_lookup (source, "org.gnome.desktop.interface", TRUE);
+	if (!schema)
+		return NULL;
+
+	/* Requires GLib 2.40, always satisfied by the GTK 3.22 dependency. */
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+	has_key = g_settings_schema_has_key (schema, "color-scheme");
+	G_GNUC_END_IGNORE_DEPRECATIONS
+	g_settings_schema_unref (schema);
+	if (!has_key)
+		return NULL;
+
+	policy_gsettings_interface = g_settings_new ("org.gnome.desktop.interface");
+	g_signal_connect (policy_gsettings_interface, "changed::color-scheme",
+	                  G_CALLBACK (policy_gsettings_changed_cb), NULL);
+	return policy_gsettings_interface;
+}
+
+static gboolean
+policy_gsettings_color_scheme (gboolean *prefers_dark)
+{
+	GSettings *settings;
+	char *scheme;
+	gboolean explicit_preference = FALSE;
+
+	settings = policy_get_interface_gsettings ();
+	if (!settings)
+		return FALSE;
+
+	scheme = g_settings_get_string (settings, "color-scheme");
+	if (g_strcmp0 (scheme, "prefer-dark") == 0)
+	{
+		*prefers_dark = TRUE;
+		explicit_preference = TRUE;
+	}
+	else if (g_strcmp0 (scheme, "prefer-light") == 0)
+	{
+		*prefers_dark = FALSE;
+		explicit_preference = TRUE;
+	}
+	g_free (scheme);
+	return explicit_preference;
+}
+
+static gboolean
+policy_gtk_heuristic_prefers_dark (void)
+{
+	GtkSettings *settings;
+	char *theme_name = NULL;
+	gboolean dark;
+
+	policy_capture_initial_gtk_state ();
+
+	/* gtk-application-prefer-dark-theme is overwritten by ZoiteChat at
+	 * runtime, so only its captured startup value (settings.ini, XSETTINGS)
+	 * reflects the user's own configuration. */
+	if (policy_initial_gtk_state_captured && policy_initial_prefer_dark)
+		return TRUE;
+
+	if (theme_gtk3_is_active ())
+	{
+		/* gtk-theme-name currently holds the in-app theme override;
+		 * fall back to the captured system theme name. */
+		theme_name = g_strdup (policy_initial_theme_name);
+	}
+	else
+	{
+		settings = gtk_settings_get_default ();
+		if (settings)
+			g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
+	}
+
+	dark = policy_theme_name_is_dark (theme_name);
+	g_free (theme_name);
+	return dark;
+}
+
+#endif /* !G_OS_WIN32 */
+
+void
+theme_policy_init (void)
+{
+	policy_capture_initial_gtk_state ();
+#ifndef G_OS_WIN32
+	policy_portal_watch_start ();
+#endif
+}
+
+void
+theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback)
+{
+	policy_appearance_changed_cb = callback;
+}
+
 gboolean
 theme_policy_system_prefers_dark (void)
 {
-	return FALSE;
+#ifdef G_OS_WIN32
+	gboolean prefer_dark = FALSE;
+
+	policy_capture_initial_gtk_state ();
+
+	if (fe_win32_high_contrast_is_enabled ())
+		return FALSE;
+	if (fe_win32_try_get_system_dark (&prefer_dark))
+		return prefer_dark;
+	return policy_theme_name_is_dark (policy_initial_theme_name);
+#else
+	gboolean prefers_dark = FALSE;
+
+	policy_capture_initial_gtk_state ();
+	policy_portal_watch_start ();
+
+	if (policy_portal_value_valid &&
+	    policy_portal_color_scheme != THEME_POLICY_COLOR_SCHEME_NO_PREFERENCE)
+		return policy_portal_color_scheme == THEME_POLICY_COLOR_SCHEME_PREFER_DARK;
+
+	if (policy_gsettings_color_scheme (&prefers_dark))
+		return prefers_dark;
+
+	return policy_gtk_heuristic_prefers_dark ();
+#endif
 }

 gboolean
--- a/src/fe-gtk/theme/theme-policy.h
+++ b/src/fe-gtk/theme/theme-policy.h
@@ -23,6 +23,10 @@

 #include "../fe-gtk.h"

+typedef void (*ThemePolicyAppearanceChangedFunc) (void);
+
+void theme_policy_init (void);
+void theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback);
 gboolean theme_policy_system_prefers_dark (void);
 gboolean theme_policy_is_dark_mode_active (unsigned int mode);
 gboolean theme_policy_is_app_dark_mode_active (void);
--- a/src/fe-gtk/theme/theme-preferences.c
+++ b/src/fe-gtk/theme/theme-preferences.c
@@ -101,6 +101,9 @@ typedef struct
        gboolean changed;
        gboolean snapshot_valid[THEME_TOKEN_COUNT];
        gboolean staged_valid[THEME_TOKEN_COUNT];
+        /* Only explicitly edited tokens are written back to the runtime
+         * palette; untouched tokens keep following the GTK3 theme. */
+        gboolean staged_dirty[THEME_TOKEN_COUNT];
        GdkRGBA snapshot[THEME_TOKEN_COUNT];
        GdkRGBA staged[THEME_TOKEN_COUNT];
 } theme_preferences_stage_state;
@@ -147,7 +150,8 @@ theme_preferences_stage_sync_runtime_to_snapshot (void)

        for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
        {
-                if (theme_preferences_stage.snapshot_valid[token])
+                if (theme_preferences_stage.snapshot_valid[token] &&
+                    theme_preferences_stage.staged_dirty[token])
                        theme_manager_set_token_color (ZOITECHAT_DARK_MODE_LIGHT, token,
                                                       &theme_preferences_stage.snapshot[token], NULL);
        }
@@ -160,7 +164,8 @@ theme_preferences_stage_sync_runtime_to_staged (void)

        for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
        {
-                if (theme_preferences_stage.staged_valid[token])
+                if (theme_preferences_stage.staged_valid[token] &&
+                    theme_preferences_stage.staged_dirty[token])
                        theme_manager_set_token_color (ZOITECHAT_DARK_MODE_LIGHT, token,
                                                       &theme_preferences_stage.staged[token], NULL);
        }
@@ -179,6 +184,7 @@ theme_preferences_staged_set_color (ThemeSemanticToken token, const GdkRGBA *rgb
        {
                theme_preferences_stage.staged[token] = *rgba;
                theme_preferences_stage.staged_valid[token] = TRUE;
+                theme_preferences_stage.staged_dirty[token] = TRUE;
                theme_preferences_stage_recompute_changed ();
                if (color_change_flag)
                        *color_change_flag = theme_preferences_stage.changed;
@@ -841,6 +847,10 @@ theme_preferences_manager_dialog_response_cb (GtkDialog *dialog, gint response_i
                        ThemeSemanticToken token;
                        ThemeWidgetStyleValues style_values;

+                        /* The runtime palette was just reset; drop any
+                         * pending edits so the reset is not re-pinned. */
+                        memset (theme_preferences_stage.staged_dirty, 0,
+                                sizeof (theme_preferences_stage.staged_dirty));
                        for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
                        {
                                GdkRGBA rgba;
@@ -855,7 +865,6 @@ theme_preferences_manager_dialog_response_cb (GtkDialog *dialog, gint response_i
                        theme_preferences_stage.staged_valid[THEME_TOKEN_TEXT_FOREGROUND] = TRUE;
                        theme_preferences_stage.staged[THEME_TOKEN_TEXT_BACKGROUND] = style_values.background;
                        theme_preferences_stage.staged_valid[THEME_TOKEN_TEXT_BACKGROUND] = TRUE;
-                        theme_preferences_stage_sync_runtime_to_staged ();
                        theme_preferences_stage_recompute_changed ();
                        if (ui->color_change_flag)
                                *ui->color_change_flag = theme_preferences_stage.changed;
@@ -1534,11 +1543,31 @@ theme_preferences_gtk3_sync_remove_state (theme_preferences_ui *ui)
        gtk_widget_set_sensitive (ui->gtk3_remove, source == ZOITECHAT_GTK3_THEME_SOURCE_USER);
 }

+static void
+theme_preferences_stage_rebase_color (ThemeSemanticToken token, const GdkRGBA *rgba)
+{
+	if (token < 0 || token >= THEME_TOKEN_COUNT || !rgba)
+		return;
+	if (!theme_preferences_stage.active)
+		return;
+
+	/* The theme changed underneath the dialog: shift the baseline so the
+	 * new theme-provided value is neither treated as a user edit nor
+	 * pinned into the runtime palette. */
+	theme_preferences_stage.snapshot[token] = *rgba;
+	theme_preferences_stage.staged[token] = *rgba;
+	theme_preferences_stage.snapshot_valid[token] = TRUE;
+	theme_preferences_stage.staged_valid[token] = TRUE;
+	theme_preferences_stage.staged_dirty[token] = FALSE;
+	theme_preferences_stage_recompute_changed ();
+}
+
 static void
 theme_preferences_gtk3_sync_runtime_palette (theme_preferences_ui *ui)
 {
 	ThemeWidgetStyleValues style_values;
 	GtkWidget *style_source = NULL;
+	gboolean follows_system_theme = prefs.hex_gui_gtk3_theme[0] == '\0';

 	if (ui && ui->parent)
 		style_source = GTK_WIDGET (ui->parent);
@@ -1549,6 +1578,18 @@ theme_preferences_gtk3_sync_runtime_palette (theme_preferences_ui *ui)

 	theme_get_widget_style_values_for_widget (style_source, &style_values);

+	if (follows_system_theme)
+	{
+		/* Following the system GTK3 theme: leave the mapped tokens
+		 * unpinned so they keep tracking the theme, and only refresh
+		 * what the dialog shows. */
+		theme_preferences_stage_rebase_color (THEME_TOKEN_TEXT_FOREGROUND, &style_values.foreground);
+		theme_preferences_stage_rebase_color (THEME_TOKEN_TEXT_BACKGROUND, &style_values.background);
+		theme_preferences_stage_rebase_color (THEME_TOKEN_SELECTION_FOREGROUND, &style_values.selection_foreground);
+		theme_preferences_stage_rebase_color (THEME_TOKEN_SELECTION_BACKGROUND, &style_values.selection_background);
+		return;
+	}
+
 	theme_preferences_staged_set_color (THEME_TOKEN_TEXT_FOREGROUND,
 	                                    &style_values.foreground,
 	                                    NULL,
--- a/win32/config.h.tt
+++ b/win32/config.h.tt
@@ -9,7 +9,6 @@
 #define PACKAGE_VERSION "<#= [string]::Join('.', $versionParts) #>"
 #define ZOITECHATLIBDIR ".\\plugins"
 #define ZOITECHATSHAREDIR "."
-#define ZOITECHATDOCDIR "offline-docs"
 #define OLD_PERL
 #define GETTEXT_PACKAGE "zoitechat"
 #define PACKAGE_TARNAME "zoitechat-<#= [string]::Join('.', $versionParts) #>"
--- a/win32/installer/zoitechat.iss.tt
+++ b/win32/installer/zoitechat.iss.tt
@@ -49,7 +49,6 @@ Name: "icons"; Description: "Create Shortcuts"; Types: custom; Flags: disablenou
 Name: "icons\desktopicon"; Description: "Create Desktop Shortcut"; Types: custom; Flags: disablenouninstallwarning
 Name: "icons\quicklaunchicon"; Description: "Create Quick Launch Shortcut"; Types: custom; Flags: disablenouninstallwarning
 Name: "translations"; Description: "Translations"; Types: normal custom; Flags: disablenouninstallwarning
-Name: "docs"; Description: "Offline Documentation"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "spell"; Description: "Spelling Dictionaries"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins"; Description: "Plugins"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\checksum"; Description: "Checksum"; Types: custom; Flags: disablenouninstallwarning
@@ -110,9 +109,6 @@ Source: "share\themes\MS-Windows\*"; DestDir: "{app}\share\themes\MS-Windows"; F
 Source: "share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
 Source: "share\icons\hicolor\*"; DestDir: "{app}\share\icons\hicolor"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
 Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations
-; Staged at build time by data\misc\build_offline_docs.py; absent when the
-; docs could not be built, in which case Help->Contents opens the website
-Source: "offline-docs\*"; DestDir: "{app}\offline-docs"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: docs
 Source: "etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs

 Source: "atk-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
Author	SHA1	Message	Date
deepend-tildeclub	635301f8f3	theming: respect system theme by default	2026-07-09 11:01:08 -06:00
deepend-tildeclub	b7f8327209	Merge pull request #341 from ZoiteChat/theme_manager_get_channel_tree_palette_behavior Use owned channel tree font for palette behavior	2026-07-09 10:57:13 -06:00
deepend-tildeclub	27c82d8411	Use owned channel tree font for palette behavior	2026-07-09 10:38:52 -06:00
deepend-tildeclub	e0b159c069	Remove Manjaro package. Handled seperately.	2026-07-08 12:24:08 -06:00