fix: brief freezes after file dialogs / fontconfig methods are used

tested and fixed new templates
fixed hyprland and kvantum configs
2026-04-09 04:29:04 +03:00 · 2026-01-12 23:52:33 +03:00 · 2026-01-12 20:31:02 +03:00 · 2026-01-12 19:18:25 +03:00 · 2026-01-12 14:45:10 +03:00 · 2026-01-12 14:39:00 +03:00
135 changed files with 15263 additions and 2702 deletions
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -49,6 +49,7 @@ jobs:
          sudo apt-get update
          sudo apt-get install -y cmake build-essential git \
            libglfw3-dev libfreetype6-dev libfontconfig1-dev \
+            zlib1g-dev libharfbuzz-dev \
            libx11-dev libxrandr-dev libxi-dev libgtk-3-dev \
            mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev \
            libxinerama-dev libxcursor-dev libxkbcommon-dev
@@ -83,6 +84,7 @@ jobs:
        run: |
          dnf install -y cmake gcc gcc-c++ make rpm-build git \
            glfw-devel freetype-devel fontconfig-devel \
+            zlib-devel harfbuzz-devel \
            libX11-devel libXrandr-devel libXi-devel \
            mesa-libGL-devel mesa-libGLU-devel \
            libXinerama-devel libXcursor-devel \
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 .vs
 out

+.clangd
+
 build/
 build-msvc/
 CMakeCache.txt
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,7 +1,4 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
    "version": "0.2.0",
    "configurations": [
        {
@@ -9,11 +6,7 @@
            "type": "cppdbg",
            "request": "launch",
            "program": "${command:cmake.launchTargetPath}",
-            "args": [
-                "--apply",
-                "--theme",
-                "dark"
-            ],
+            "args": [],
            "stopAtEntry": false,
            "cwd": "${workspaceFolder}",
            "environment": [],
@@ -37,16 +30,24 @@
            "type": "cppdbg",
            "request": "launch",
            "program": "${command:cmake.launchTargetPath}",
-            "args": [
-                "--apply",
-                "--theme",
-                "dark"
-            ],
+            "args": [],
            "stopAtEntry": false,
            "cwd": "${workspaceFolder}",
            "environment": [],
            "externalConsole": false,
            "MIMode": "lldb",
+            "miDebuggerPath": "lldb"
        },
+        {
+            "name": "Debug current target (MSVC)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${command:cmake.launchTargetPath}",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "console": "integratedTerminal"
+        }
    ]
 }
--- a/.vscode/settnigs.json
+++ b/.vscode/settnigs.json
@@ -0,0 +1,3 @@
+{
+  "cmake.useCMakePresets": "always"
+}
--- a/AUR/PKGBUILD
+++ b/AUR/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Daniel Dada <dan@binarygoose.dev>
 pkgname=clrsync
-pkgver=0.1.6
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="Color scheme manager"
 arch=('x86_64')
--- a/AUR/PKGBUILD-git
+++ b/AUR/PKGBUILD-git
@@ -1,6 +1,6 @@
 # Maintainer: Daniel Dada <dan@binarygoose.dev>
 pkgname=clrsync-git
-pkgver=r22.d8baae2
+pkgver=r107.4229db4
 pkgrel=1
 pkgdesc="Color scheme manager (git version)"
 arch=('x86_64')
@@ -10,6 +10,8 @@ depends=(
    glfw
    freetype2
    fontconfig
+    zlib
+    harfbuzz
    mesa
    libglvnd
    libxcursor
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
-project(clrsync VERSION 0.1.6 LANGUAGES CXX)
+project(clrsync VERSION 1.0.4 LANGUAGES CXX)

 include(GNUInstallDirs)

@@ -10,6 +10,9 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

+file(WRITE "${CMAKE_SOURCE_DIR}/.clangd" 
+    "CompileFlags:\n  CompilationDatabase: ${CMAKE_BINARY_DIR}\n")
+
 option(USE_SYSTEM_GLFW "Use system-installed GLFW instead of fetching it statically" OFF)
 message(STATUS "USE_SYSTEM_GLFW: ${USE_SYSTEM_GLFW}")

@@ -57,8 +60,8 @@ endif()
 message(STATUS "clrsync version: ${SEMVER}")

 configure_file(
-    ${CMAKE_SOURCE_DIR}/src/core/version.hpp.in
-    ${CMAKE_SOURCE_DIR}/src/core/version.hpp
+    ${CMAKE_SOURCE_DIR}/src/core/common/version.hpp.in
+    ${CMAKE_SOURCE_DIR}/src/core/common/version.hpp
    @ONLY
 )

--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -0,0 +1,325 @@
+{
+  "version": 6,
+  "configurePresets": [
+    {
+      "name": "base",
+      "hidden": true
+    },
+    {
+      "name": "debug",
+      "hidden": true,
+      "inherits": "base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "release",
+      "hidden": true,
+      "inherits": "base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "linux",
+      "hidden": true,
+      "inherits": "base",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      }
+    },
+    {
+      "name": "windows",
+      "hidden": true,
+      "inherits": "base",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
+    {
+      "name": "macos",
+      "hidden": true,
+      "inherits": "base",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      }
+    },
+    {
+      "name": "gcc",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "gcc",
+        "CMAKE_CXX_COMPILER": "g++"
+      }
+    },
+    {
+      "name": "clang",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "clang",
+        "CMAKE_CXX_COMPILER": "clang++"
+      }
+    },
+    {
+      "name": "ninja",
+      "hidden": true,
+      "generator": "Ninja"
+    },
+    {
+      "name": "make",
+      "hidden": true,
+      "generator": "Unix Makefiles"
+    },
+    {
+      "name": "msvc-ninja",
+      "displayName": "MSVC (Ninja)",
+      "generator": "Ninja",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/build/windows/msvc",
+      "cacheVariables": {
+      "CMAKE_C_COMPILER": "cl",
+      "CMAKE_CXX_COMPILER": "cl"
+  }
+    },
+    {
+      "name": "msvc-vs2026",
+      "displayName": "MSVC (Visual Studio 18 2026)",
+      "generator": "Visual Studio 18 2026",
+      "binaryDir": "${sourceDir}/build/windows/msvc/vs2026",
+      "architecture": {
+        "value": "x64"
+      }
+    },
+    {
+      "name": "windows-msvc-ninja-debug",
+      "inherits": [
+        "windows",
+        "msvc-ninja",
+        "ninja",
+        "debug"
+      ],
+      "displayName": "Windows · MSVC · Ninja · Debug",
+      "binaryDir": "${sourceDir}/build/windows/msvc/ninja/debug"
+    },
+    {
+      "name": "windows-msvc-ninja-release",
+      "inherits": [
+        "windows",
+        "msvc-ninja",
+        "ninja",
+        "release"
+      ],
+      "displayName": "Windows · MSVC · Ninja · Release",
+      "binaryDir": "${sourceDir}/build/windows/msvc/ninja/release"
+    },
+    {
+      "name": "linux-gcc-ninja-debug",
+      "inherits": [
+        "linux",
+        "gcc",
+        "ninja",
+        "debug"
+      ],
+      "displayName": "Linux · GCC · Ninja · Debug",
+      "binaryDir": "${sourceDir}/build/linux/gcc/ninja/debug"
+    },
+    {
+      "name": "linux-gcc-ninja-release",
+      "inherits": [
+        "linux",
+        "gcc",
+        "ninja",
+        "release"
+      ],
+      "displayName": "Linux · GCC · Ninja · Release",
+      "binaryDir": "${sourceDir}/build/linux/gcc/ninja/release"
+    },
+    {
+      "name": "linux-gcc-make-debug",
+      "inherits": [
+        "linux",
+        "gcc",
+        "make",
+        "debug"
+      ],
+      "displayName": "Linux · GCC · Make · Debug",
+      "binaryDir": "${sourceDir}/build/linux/gcc/make/debug"
+    },
+    {
+      "name": "linux-gcc-make-release",
+      "inherits": [
+        "linux",
+        "gcc",
+        "make",
+        "release"
+      ],
+      "displayName": "Linux · GCC · Make · Release",
+      "binaryDir": "${sourceDir}/build/linux/gcc/make/release"
+    },
+    {
+      "name": "linux-clang-ninja-debug",
+      "inherits": [
+        "linux",
+        "clang",
+        "ninja",
+        "debug"
+      ],
+      "displayName": "Linux · Clang · Ninja · Debug",
+      "binaryDir": "${sourceDir}/build/linux/clang/ninja/debug"
+    },
+    {
+      "name": "linux-clang-ninja-release",
+      "inherits": [
+        "linux",
+        "clang",
+        "ninja",
+        "release"
+      ],
+      "displayName": "Linux · Clang · Ninja · Release",
+      "binaryDir": "${sourceDir}/build/linux/clang/ninja/release"
+    },
+    {
+      "name": "linux-clang-make-debug",
+      "inherits": [
+        "linux",
+        "clang",
+        "make",
+        "debug"
+      ],
+      "displayName": "Linux · Clang · Make · Debug",
+      "binaryDir": "${sourceDir}/build/linux/clang/make/debug"
+    },
+    {
+      "name": "linux-clang-make-release",
+      "inherits": [
+        "linux",
+        "clang",
+        "make",
+        "release"
+      ],
+      "displayName": "Linux · Clang · Make · Release",
+      "binaryDir": "${sourceDir}/build/linux/clang/make/release"
+    },
+    {
+      "name": "macos-appleclang-ninja-debug",
+      "inherits": [
+        "macos",
+        "clang",
+        "ninja",
+        "debug"
+      ],
+      "displayName": "macOS · Apple Clang · Ninja · Debug",
+      "binaryDir": "${sourceDir}/build/macos/appleclang/ninja/debug"
+    },
+    {
+      "name": "macos-appleclang-ninja-release",
+      "inherits": [
+        "macos",
+        "clang",
+        "ninja",
+        "release"
+      ],
+      "displayName": "macOS · Apple Clang · Ninja · Release",
+      "binaryDir": "${sourceDir}/build/macos/appleclang/ninja/release"
+    },
+    {
+      "name": "macos-appleclang-make-debug",
+      "inherits": [
+        "macos",
+        "clang",
+        "make",
+        "debug"
+      ],
+      "displayName": "macOS · Apple Clang · Make · Debug",
+      "binaryDir": "${sourceDir}/build/macos/appleclang/make/debug"
+    },
+    {
+      "name": "macos-appleclang-make-release",
+      "inherits": [
+        "macos",
+        "clang",
+        "make",
+        "release"
+      ],
+      "displayName": "macOS · Apple Clang · Make · Release",
+      "binaryDir": "${sourceDir}/build/macos/appleclang/make/release"
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "vs-debug",
+      "configurePreset": "msvc-vs2026",
+      "configuration": "Debug"
+    },
+    {
+      "name": "vs-release",
+      "configurePreset": "msvc-vs2026",
+      "configuration": "Release"
+    },
+    {
+      "name": "msvc-ninja-debug",
+      "configurePreset": "windows-msvc-ninja-debug",
+      "configuration": "Debug"
+    },
+    {
+      "name": "msvc-ninja-release",
+      "configurePreset": "windows-msvc-ninja-release",
+      "configuration": "Release"
+    },
+    {
+      "name": "linux-gcc-ninja-debug",
+      "configurePreset": "linux-gcc-ninja-debug"
+    },
+    {
+      "name": "linux-gcc-ninja-release",
+      "configurePreset": "linux-gcc-ninja-release"
+    },
+    {
+      "name": "linux-gcc-make-debug",
+      "configurePreset": "linux-gcc-make-debug"
+    },
+    {
+      "name": "linux-gcc-make-release",
+      "configurePreset": "linux-gcc-make-release"
+    },
+    {
+      "name": "linux-clang-ninja-debug",
+      "configurePreset": "linux-clang-ninja-debug"
+    },
+    {
+      "name": "linux-clang-ninja-release",
+      "configurePreset": "linux-clang-ninja-release"
+    },
+    {
+      "name": "linux-clang-make-debug",
+      "configurePreset": "linux-clang-make-debug"
+    },
+    {
+      "name": "linux-clang-make-release",
+      "configurePreset": "linux-clang-make-release"
+    },
+    {
+      "name": "macos-appleclang-ninja-debug",
+      "configurePreset": "macos-appleclang-ninja-debug"
+    },
+    {
+      "name": "macos-appleclang-ninja-release",
+      "configurePreset": "macos-appleclang-ninja-release"
+    },
+    {
+      "name": "macos-appleclang-make-debug",
+      "configurePreset": "macos-appleclang-make-debug"
+    },
+    {
+      "name": "macos-appleclang-make-release",
+      "configurePreset": "macos-appleclang-make-release"
+    }
+  ]
+}
--- a/README.md
+++ b/README.md
@@ -3,8 +3,6 @@

 # clrsync

-**Notice:** This application is not yet released and is subject to change.  
-
 A theme management tool for synchronizing color schemes across multiple applications. clrsync allows to define color palettes once and apply them consistently to all configurable applications.

 ![Preview](assets/screenshot.png)
@@ -34,6 +32,7 @@ A theme management tool for synchronizing color schemes across multiple applicat
 - [Usage](#usage)
  - [CLI](#cli)
  - [GUI](#gui)
+- [Extras](#extras)
 - [Acknowledgments](#acknowledgments)

 ## Features
@@ -47,6 +46,14 @@ A theme management tool for synchronizing color schemes across multiple applicat

 ### Linux

+#### Arch Linux
+
+Install the package from AUR using any helper or install manually
+
+```shell
+yay -S clrsync-git
+```
+
 #### Ubuntu

 1. Download the latest .deb from the [releases page](https://github.com/obsqrbtz/clrsync/releases)
@@ -457,6 +464,10 @@ The GUI provides:
 - **Template Editor**: Edit template files
 - **Live Preview**: See changes in real-time

+## Extras
+
+You may find some pre-configured color schemes and templates in [extra](extra) directory of this repository.
+
 ## Acknowledgments

 - **[matugen](https://github.com/InioX/matugen)** - A material you color generation tool
@@ -465,4 +476,3 @@ The GUI provides:
 - **[toml++](https://github.com/marzer/tomlplusplus)** - Header-only TOML config file parser and serializer for C++17
 - **[argparse](https://github.com/p-ranav/argparse)** - Argument Parser for Modern C++
 - **[ImGuiColorTextEdit](https://github.com/BalazsJako/ImGuiColorTextEdit)** - Syntax highlighting text editor for ImGui
- **cursed** by **[pyratebeard](https://pyratebeard.net)** - Color scheme
--- a/2
+++ b/2
@@ -1 +1 @@
-0.1.6
+1.0.4
--- a/assets/screenshot.png
+++ b/assets/screenshot.png
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -7,6 +7,7 @@ if(WIN32)
        freetype
        URL https://download.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.gz
    )
+        
    FetchContent_MakeAvailable(freetype)
 elseif(APPLE)
    option(USE_SYSTEM_GLFW ON)
@@ -15,10 +16,6 @@ elseif(APPLE)
    find_package(BZip2 REQUIRED)
    find_package(PNG REQUIRED)
    
-    
-    find_library(BROTLIDEC_LIBRARY NAMES brotlidec)
-    find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon)
-    
    find_package(PkgConfig QUIET)
    if(PkgConfig_FOUND)
        pkg_check_modules(HARFBUZZ harfbuzz)
@@ -30,10 +27,8 @@ else()
    find_package(ZLIB REQUIRED)
    find_package(BZip2 REQUIRED)
    find_package(PNG REQUIRED)
-
    find_library(BROTLIDEC_LIBRARY NAMES brotlidec)
    find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon)
-
    pkg_check_modules(HARFBUZZ harfbuzz)
    pkg_check_modules(WAYLAND_CLIENT wayland-client)
    pkg_check_modules(WAYLAND_EGL wayland-egl)
@@ -81,7 +76,6 @@ if(BROTLIDEC_LIBRARY AND BROTLICOMMON_LIBRARY)
    list(APPEND FREETYPE_EXTRA_LIBS ${BROTLIDEC_LIBRARY} ${BROTLICOMMON_LIBRARY})
    message(STATUS "Found Brotli libraries")
 endif()
-
 if(HARFBUZZ_FOUND)
    list(APPEND FREETYPE_EXTRA_LIBS ${HARFBUZZ_LIBRARIES})
    message(STATUS "Found HarfBuzz")
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -27,7 +27,7 @@ set(CPACK_NSIS_CREATE_DESKTOP_LINKS "bin/clrsync_gui.exe;clrsync")

 # Debian
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Daniel Dada <dan@binarygoose.dev>")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.31), libglfw3, libfreetype6")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.31), libglfw3, libfreetype6, zlib1g, libharfbuzz0b")
 set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
@@ -36,6 +36,6 @@ set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
 set(CPACK_RPM_PACKAGE_LICENSE "MIT")
 set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
 set(CPACK_RPM_PACKAGE_URL "https://github.com/obsqrbtz/clrsync")
-set(CPACK_RPM_PACKAGE_REQUIRES "freetype, glfw, fontconfig")
+set(CPACK_RPM_PACKAGE_REQUIRES "freetype, glfw, fontconfig, zlib, harfbuzz")

 include(CPack)
--- a/example_config/config.toml
+++ b/example_config/config.toml
@@ -12,7 +12,7 @@ output_path = '~/.config/clrsync/formats-demo'
 [templates.kitty]
 enabled = true
 input_path = '~/.config/clrsync/templates/kitty.conf'
-output_path = '~/.config/kitty/kitty_test.conf'
+output_path = '~/.config/kitty/clrsync.conf'
 reload_cmd = 'pkill -SIGUSR1 kitty'

 [templates.nvim]
--- a/extra/README.md
+++ b/extra/README.md
@@ -0,0 +1,308 @@
+# Extras
+
+This directory contains additional palettes and pre-configured templates for various applications.
+
+## Navigation
+
+- [Palettes](#palettes)
+  - [Cursed](#cursed)
+  - [Cursed Light](#cursed-light)
+  - [Nord](#nord)
+- [Pre-configured Templates](#pre-configured-templates)
+  - [Terminal Emulators](#terminal-emulators)
+    - [Kitty](#kitty)
+    - [Alacritty](#alacritty)
+    - [Ghostty](#ghostty)
+  - [Text Editors](#text-editors)
+    - [Neovim](#neovim)
+    - [Visual Studio Code](#visual-studio-code)
+  - [Browsers](#browsers)
+    - [Firefox](#firefox)
+  - [Applications](#applications)
+    - [Telegram](#telegram)
+  - [Desktop Themes](#desktop-themes)
+    - [GTK](#gtk)
+    - [Qt Applications](#qt-applications)
+  - [Window Managers](#window-managers)
+    - [Hyprland](#hyprland)
+
+## Palettes
+
+### Cursed
+
+A dark color scheme inspired by the `cursed` theme by [pyratebeard](https://pyratebeard.net).
+
+<details>
+<summary>Preview</summary>
+
+![cursed](img/cursed.png)
+
+</details>
+
+### Cursed Light
+
+A light variant of the `cursed` color scheme.
+
+<details>
+<summary>Preview</summary>
+
+![cursed-light](img/cursed-light.png)
+
+</details>
+
+### Nord
+
+A color scheme based on the `Nord` palette.
+
+<details>
+<summary>Preview</summary>
+
+![nord](img/nord.png)
+
+</details>
+
+## Pre-configured Templates
+
+### Terminal Emulators
+
+#### Kitty
+
+1. Download the [template file](templates/kitty.conf)
+
+2. Configure the template in `~/.config/clrsync/config.toml`:
+
+```toml
+[templates.kitty]
+enabled = true
+input_path = '~/.config/clrsync/templates/kitty.conf'
+output_path = '~/.config/kitty/clrsync.conf'
+reload_cmd = 'pkill -SIGUSR1 kitty'
+```
+
+3. Import the generated color scheme in `~/.config/kitty/kitty.conf`:
+
+```conf
+include clrsync.conf
+```
+
+#### Alacritty
+
+1. Download the [template file](templates/alacritty.toml)
+
+2. Configure the template in `~/.config/clrsync/config.toml`:
+
+```toml
+[templates.alacritty]
+enabled = true
+input_path = '~/.config/clrsync/templates/alacritty.toml'
+output_path = '~/.config/alacritty/clrsync.toml'
+reload_cmd = ''
+```
+
+3. Import the generated color scheme in `~/.config/alacritty/alacritty.toml`:
+
+```toml
+[general]
+import = ["clrsync.toml"]
+```
+
+#### Ghostty
+
+1. Download the [template file](templates/ghostty)
+
+2. Configure the template in `~/.config/clrsync/config.toml`:
+
+```toml
+[templates.ghostty]
+enabled = true
+input_path = '~/.config/clrsync/templates/ghostty'
+output_path = '~/.config/ghostty/themes/clrsync'
+reload_cmd = 'pkill -SIGUSR2 ghostty'
+```
+
+3. Set the generated color scheme in `~/.config/ghostty/config`:
+
+```conf
+theme = "clrsync"
+```
+
+### Text Editors
+
+#### Neovim
+
+1. Download the [template file](templates/nvim.lua)
+
+2. Configure the template in `~/.config/clrsync/config.toml`:
+
+```toml
+[templates.nvim]
+enabled = true
+input_path = '~/.config/clrsync/templates/nvim.lua'
+output_path = '~/.config/nvim/colors/clrsync.lua'
+reload_cmd = ''
+```
+
+3. Set the colorscheme in your Neovim config:
+
+```lua
+vim.cmd.colorscheme 'clrsync'
+```
+
+#### Visual Studio Code
+
+1. Install the [clrsync VS Code theme](https://marketplace.visualstudio.com/items?itemName=obsqrbtz.clrsync)
+
+2. Download the [template file](templates/code.json)
+
+3. Configure the template in `~/.config/clrsync/config.toml`:
+
+```toml
+[templates.vscode]
+enabled = true
+input_path = '~/.config/clrsync/templates/code.json'
+output_path = '~/.vscode/extensions/obsqrbtz.clrsync-1.0.2/themes/clrsync-color-theme.json'
+reload_cmd = ''
+```
+
+4. Set the `clrsync` color scheme in VS Code
+
+### Browsers
+
+#### Firefox
+
+1. Go to `about:config` and set `toolkit.legacyUserProfileCustomizations.stylesheets` to `true`
+
+2. Go to `about:support` and find your profile directory
+
+3. Create a `chrome` directory in your profile
+
+4. Download the [template file](templates/userChrome.css)
+
+5. Configure clrsync to output to `<profile>/chrome/userChrome.css`:
+
+```toml
+[templates.firefox]
+enabled = true
+input_path = '~/.config/clrsync/templates/userChrome.css'
+output_path = '<profile directory>/chrome/userChrome.css'
+reload_cmd = ''
+```
+
+### Applications
+
+#### Telegram
+
+1. Download the [template file](templates/telegram.tdesktop-theme)
+
+2. Configure the template in `~/.config/clrsync/config.toml`:
+
+```toml
+[templates.telegram]
+enabled = true
+input_path = '~/.config/clrsync/templates/telegram.tdesktop-theme'
+output_path = '~/clrsync.tdesktop-theme'
+reload_cmd = ''
+```
+
+3. Apply the palette with clrsync and send the generated `clrsync.tdesktop-theme` file to yourself in Telegram
+
+4. Click on the theme file in the Telegram dialog to apply it
+
+### Desktop Themes
+
+#### GTK
+
+1. Download the [template file](templates/gtk.css)
+
+2. Configure the template in `~/.config/clrsync/config.toml`:
+
+```toml
+[templates.gtk3]
+enabled = true
+input_path = '~/.config/clrsync/templates/gtk.css'
+output_path = '~/.config/gtk-3.0/colors.css'
+reload_cmd = ''
+
+[templates.gtk4]
+enabled = true
+input_path = '~/.config/clrsync/templates/gtk.css'
+output_path = '~/.config/gtk-4.0/colors.css'
+reload_cmd = ''
+```
+
+3. Import the color scheme at the top of `~/.config/gtk-3.0/gtk.css`, `~/.config/gtk-4.0/gtk.css`, and `~/.config/gtk-4.0/gtk-dark.css`:
+
+```css
+@import 'colors.css';
+```
+
+#### Qt Applications
+
+1. Download the templates:
+   - Kvantum: [kvantum.kvconfig](templates/kvantum/kvantum.kvconfig) and [kvantum.svg](templates/kvantum/kvantum.svg)
+   - Qt5ct/Qt6ct: [qtct.conf](templates/qtct.conf)
+
+2. Configure the templates in `~/.config/clrsync/config.toml`:
+
+```toml
+[templates.kvantum]
+enabled = true
+input_path = '~/.config/clrsync/templates/kvantum/kvantum.kvconfig'
+output_path = '~/.config/Kvantum/clrsync/clrsync.kvconfig'
+reload_cmd = ''
+
+[templates.kvantum-svg]
+enabled = true
+input_path = '~/.config/clrsync/templates/kvantum/kvantum.svg'
+output_path = '~/.config/Kvantum/clrsync/clrsync.svg'
+reload_cmd = ''
+
+[templates.qt5ct]
+enabled = true
+input_path = '~/.config/clrsync/templates/qtct.conf'
+output_path = '~/.config/qt5ct/colors/clrsync.conf'
+reload_cmd = ''
+
+[templates.qt6ct]
+enabled = true
+input_path = '~/.config/clrsync/templates/qtct.conf'
+output_path = '~/.config/qt6ct/colors/clrsync.conf'
+reload_cmd = ''
+```
+
+3. Set the theme in `~/.config/Kvantum/kvantum.kvconfig`:
+
+```conf
+[General]
+theme=clrsync
+```
+
+4. Set the theme in `~/.config/qt5ct/qt5ct.conf` and `~/.config/qt6ct/qt6ct.conf`:
+
+```conf
+[Appearance]
+color_scheme_path=$HOME/.config/qt5ct/colors/clrsync.conf
+custom_palette=true
+```
+
+### Window Managers
+
+#### Hyprland
+
+1. Download the [template file](templates/hyprland.conf)
+
+2. Configure the template in `~/.config/clrsync/config.toml`:
+
+```toml
+[templates.hyprland]
+enabled = true
+input_path = '~/.config/clrsync/templates/hyprland.conf'
+output_path = '~/.config/hypr/hyprland/clrsync.conf'
+reload_cmd = ''
+```
+
+3. Source the color theme in your Hyprland config:
+
+```conf
+source=~/.config/hypr/hyprland/clrsync.conf
+```
--- a/extra/img/cursed-light.png
+++ b/extra/img/cursed-light.png
--- a/extra/img/cursed.png
+++ b/extra/img/cursed.png
--- a/extra/img/nord.png
+++ b/extra/img/nord.png
--- a/extra/palettes/cursed-light.toml
+++ b/extra/palettes/cursed-light.toml
--- a/extra/palettes/cursed.toml
+++ b/extra/palettes/cursed.toml
--- a/extra/palettes/nord.toml
+++ b/extra/palettes/nord.toml
@@ -1,5 +1,5 @@
 [colors]
-accent = '#5E81ACFF'
+accent = '#A1CDFAFF'
 background = '#2E3440FF'
 base00 = '#2E3440FF'
 base01 = '#BF616AFF'
--- a/extra/templates/alacritty.toml
+++ b/extra/templates/alacritty.toml
@@ -0,0 +1,69 @@
+[colors.primary]
+background = '{background}'
+foreground = '{foreground}'
+
+[colors.cursor]
+text = '{background}'
+cursor = '{cursor}'
+
+[colors.vi_mode_cursor]
+text = '{background}'
+cursor = '{cursor}'
+
+[colors.selection]
+text = 'CellForeground'
+background = '{editor_selected}'
+
+[colors.search.matches]
+foreground = '{background}'
+background = '{base0A}'
+
+[colors.search.focused_match]
+foreground = '{background}'
+background = '{accent}'
+
+[colors.footer_bar]
+foreground = '{foreground}'
+background = '{surface}'
+
+[colors.hints.start]
+foreground = '{background}'
+background = '{warning}'
+
+[colors.hints.end]
+foreground = '{background}'
+background = '{surface_variant}'
+
+[colors.line_indicator]
+foreground = 'None'
+background = 'None'
+
+[colors.normal]
+black = '{base00}'
+red = '{base08}'
+green = '{base01}'
+yellow = '{base02}'
+blue = '{base06}'
+magenta = '{base05}'
+cyan = '{base0E}'
+white = '{base07}'
+
+[colors.bright]
+black = '{border_focused}'
+red = '{editor_error}'
+green = '{editor_success}'
+yellow = '{base0A}'
+blue = '{editor_link}'
+magenta = '{base0D}'
+cyan = '{editor_comment}'
+white = '{base0F}'
+
+[colors.dim]
+black = '{border}'
+red = '{base0C}'
+green = '{base01}'
+yellow = '{editor_string}'
+blue = '{base06}'
+magenta = '{base05}'
+cyan = '{base0E}'
+white = '{base07}'
--- a/extra/templates/code.json
+++ b/extra/templates/code.json
--- a/extra/templates/ghostty
+++ b/extra/templates/ghostty
@@ -0,0 +1,26 @@
+background = {background}
+foreground = {foreground}
+
+cursor-color = {cursor}
+cursor-text = {foreground}
+
+selection-background = {editor_selected}
+selection-foreground = {foreground}
+
+palette = 0={base00}
+palette = 1={base08}
+palette = 2={base01}
+palette = 3={base02}
+palette = 4={base06}
+palette = 5={base05}
+palette = 6={base0E}
+palette = 7={base07}
+
+palette = 8={border_focused}
+palette = 9={editor_error}
+palette = 10={editor_success}
+palette = 11={base0A}
+palette = 12={editor_link}
+palette = 13={base0D}
+palette = 14={editor_comment}
+palette = 15={base0F}
--- a/extra/templates/gtk.css
+++ b/extra/templates/gtk.css
@@ -0,0 +1,88 @@
+@define-color accent_color {accent};
+@define-color accent_bg_color {accent};
+@define-color accent_fg_color {on_surface};
+@define-color destructive_color {error};
+@define-color destructive_bg_color {error};
+@define-color destructive_fg_color {on_error};
+@define-color success_color {success};
+@define-color success_bg_color {success};
+@define-color success_fg_color {on_success};
+@define-color warning_color {warning};
+@define-color warning_bg_color {warning};
+@define-color warning_fg_color {on_warning};
+@define-color error_color {error};
+@define-color error_bg_color {error};
+@define-color error_fg_color {on_error};
+@define-color window_bg_color {background};
+@define-color window_fg_color {on_background};
+@define-color view_bg_color {background};
+@define-color view_fg_color {foreground};
+@define-color headerbar_bg_color {surface};
+@define-color headerbar_fg_color {on_surface};
+@define-color headerbar_border_color {border};
+@define-color headerbar_backdrop_color @window_bg_color;
+@define-color headerbar_shade_color {border};
+@define-color sidebar_bg_color {surface_variant};
+@define-color sidebar_fg_color {on_surface};
+@define-color sidebar_border_color {border};
+@define-color sidebar_backdrop_color @window_bg_color;
+@define-color sidebar_shade_color {border};
+@define-color card_bg_color {surface};
+@define-color card_fg_color {on_surface};
+@define-color card_shade_color {border};
+@define-color dialog_bg_color {surface};
+@define-color dialog_fg_color {on_surface};
+@define-color popover_bg_color {surface_variant};
+@define-color popover_fg_color {on_surface_variant};
+@define-color shade_color {border};
+@define-color scrollbar_outline_color {border};
+
+@define-color blue_1 {base0C};
+@define-color blue_2 {base04};
+@define-color blue_3 {base04};
+@define-color blue_4 {base04};
+@define-color blue_5 {base04};
+@define-color green_1 {success};
+@define-color green_2 {success};
+@define-color green_3 {success};
+@define-color green_4 {base02};
+@define-color green_5 {base02};
+@define-color yellow_1 {base0B};
+@define-color yellow_2 {base03};
+@define-color yellow_3 {base03};
+@define-color yellow_4 {base03};
+@define-color yellow_5 {base03};
+@define-color orange_1 {warning};
+@define-color orange_2 {warning};
+@define-color orange_3 {warning};
+@define-color orange_4 {warning};
+@define-color orange_5 {warning};
+@define-color red_1 {error};
+@define-color red_2 {error};
+@define-color red_3 {error};
+@define-color red_4 {base01};
+@define-color red_5 {base01};
+@define-color purple_1 {base0D};
+@define-color purple_2 {base05};
+@define-color purple_3 {base05};
+@define-color purple_4 {base05};
+@define-color purple_5 {base05};
+@define-color brown_1 {base0E};
+@define-color brown_2 {base0E};
+@define-color brown_3 {base0E};
+@define-color brown_4 {base0E};
+@define-color brown_5 {base0E};
+@define-color light_1 {on_background};
+@define-color light_2 {on_surface};
+@define-color light_3 {on_surface_variant};
+@define-color light_4 {border};
+@define-color light_5 {border};
+@define-color dark_1 {border};
+@define-color dark_2 {surface_variant};
+@define-color dark_3 {surface};
+@define-color dark_4 {background};
+@define-color dark_5 {base00};
+
+scale trough highlight {
+    background: {accent}
+}
--- a/extra/templates/hyprland.conf
+++ b/extra/templates/hyprland.conf
@@ -0,0 +1,25 @@
+$primary = rgb({accent.hex_stripped})
+$surface = rgb({surface.hex_stripped})
+$secondary = rgb({base04.hex_stripped})
+$error = rgb({error.hex_stripped})
+$tertiary = rgb({base06.hex_stripped})
+$surface_lowest = rgb({background.hex_stripped})
+
+general {
+    col.active_border = $primary
+    col.inactive_border = $surface
+}
+
+group {
+    col.border_active = $secondary
+    col.border_inactive = $surface
+    col.border_locked_active = $error
+    col.border_locked_inactive = $surface
+
+    groupbar {
+        col.active = $secondary
+        col.inactive = $surface
+        col.locked_active = $error
+        col.locked_inactive = $surface
+    }
+}
--- a/extra/templates/kitty.conf
+++ b/extra/templates/kitty.conf
@@ -0,0 +1,32 @@
+cursor              {cursor}
+cursor_text_color   {background}
+
+foreground            {foreground}
+background            {background}
+selection_foreground  {on_surface}
+selection_background  {surface}
+url_color             {accent}
+
+color0      {base00}
+color8      {base08}
+
+color1      {base01}
+color9      {base09}
+
+color2      {base02}
+color10     {base0A}
+
+color3      {base03}
+color11     {base0B}
+
+color4      {base04}
+color12     {base0C}
+
+color5      {base05}
+color13     {base0D}
+
+color6      {base06}
+color14     {base0E}
+
+color7      {base07}
+color15     {base0F}
--- a/extra/templates/kvantum/kvantum.kvconfig
+++ b/extra/templates/kvantum/kvantum.kvconfig
@@ -0,0 +1,571 @@
+[%General]
+author=Matugen, based on MaterialADW by Vince Liuice
+comment=A Material You theme generated by Matugen
+x11drag=none
+alt_mnemonic=true
+left_tabs=false
+attach_active_tab=false
+mirror_doc_tabs=true
+group_toolbar_buttons=false
+toolbar_item_spacing=0
+toolbar_interior_spacing=2
+spread_progressbar=true
+composite=true
+menu_shadow_depth=6
+spread_menuitems=false
+tooltip_shadow_depth=7
+splitter_width=1
+scroll_width=9
+scroll_arrows=false
+scroll_min_extent=60
+slider_width=2
+slider_handle_width=23
+slider_handle_length=22
+tickless_slider_handle_size=22
+center_toolbar_handle=true
+check_size=24
+textless_progressbar=false
+progressbar_thickness=2
+menubar_mouse_tracking=true
+toolbutton_style=1
+double_click=false
+translucent_windows=false
+blurring=false
+popup_blurring=false
+vertical_spin_indicators=false
+spin_button_width=24
+fill_rubberband=false
+merge_menubar_with_toolbar=true
+small_icon_size=16
+large_icon_size=32
+button_icon_size=16
+toolbar_icon_size=16
+combo_as_lineedit=true
+animate_states=true
+button_contents_shift=false
+combo_menu=true
+hide_combo_checkboxes=true
+combo_focus_rect=false
+groupbox_top_label=true
+inline_spin_indicators=true
+joined_inactive_tabs=false
+layout_spacing=3
+layout_margin=3
+scrollbar_in_view=true
+transient_scrollbar=true
+transient_groove=false
+submenu_overlap=0
+tooltip_delay=0
+tree_branch_line=false
+no_window_pattern=false
+opaque=kaffeine,kmplayer,subtitlecomposer,kdenlive,vlc,smplayer,smplayer2,avidemux,avidemux2_qt4,avidemux3_qt4,avidemux3_qt5,kamoso,QtCreator,VirtualBox,VirtualBoxVM,trojita,dragon,digikam,lyx
+reduce_window_opacity=0
+respect_DE=true
+scrollable_menu=false
+submenu_delay=150
+no_inactiveness=false
+reduce_menu_opacity=0
+click_behavior=2
+contrast=1.00
+dialog_button_layout=0
+intensity=1.00
+saturation=1.00
+shadowless_popup=false
+drag_from_buttons=false
+menu_blur_radius=0
+tooltip_blur_radius=0
+
+[GeneralColors]
+window.color={background}
+base.color={surface}
+alt.base.color={surface}
+button.color={surface_variant}
+light.color={surface}
+mid.light.color={surface_variant}
+dark.color={surface_variant}
+mid.color={surface_variant}
+highlight.color={accent}
+inactive.highlight.color={accent}
+text.color={on_background}
+window.text.color={on_background}
+button.text.color={on_surface_variant}
+disabled.text.color={editor_disabled}
+tooltip.text.color={on_surface}
+highlight.text.color={on_surface}
+link.color={base04}
+link.visited.color={base05}
+progress.indicator.text.color={on_surface}
+
+[Hacks]
+transparent_ktitle_label=true
+transparent_dolphin_view=true
+transparent_pcmanfm_sidepane=true
+blur_translucent=false
+transparent_menutitle=true
+respect_darkness=true
+kcapacitybar_as_progressbar=true
+force_size_grip=true
+iconless_pushbutton=false
+iconless_menu=false
+disabled_icon_opacity=100
+lxqtmainmenu_iconsize=16
+normal_default_pushbutton=true
+single_top_toolbar=true
+tint_on_mouseover=0
+transparent_pcmanfm_view=true
+no_selection_tint=true
+transparent_arrow_button=true
+middle_click_scroll=false
+opaque_colors=false
+kinetic_scrolling=false
+scroll_jump_workaround=true
+centered_forms=false
+noninteger_translucency=false
+style_vertical_toolbars=false
+blur_only_active_window=true
+
+[PanelButtonCommand]
+frame=true
+frame.element=button
+frame.top=6
+frame.bottom=6
+frame.left=6
+frame.right=6
+interior=true
+interior.element=button
+indicator.size=8
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+text.shadow=0
+text.margin=4
+text.iconspacing=4
+indicator.element=arrow
+frame.expansion=0
+
+[PanelButtonTool]
+inherits=PanelButtonCommand
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+text.bold=false
+indicator.element=arrow
+indicator.size=8
+frame.expansion=0
+
+[ToolbarButton]
+frame=true
+frame.element=tbutton
+interior.element=tbutton
+frame.top=16
+frame.bottom=16
+frame.left=16
+frame.right=16
+indicator.element=tarrow
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+text.bold=false
+frame.expansion=32
+
+[Dock]
+inherits=PanelButtonCommand
+interior.element=dock
+frame.element=dock
+frame.top=1
+frame.bottom=1
+frame.left=1
+frame.right=1
+text.normal.color={on_surface}
+
+[DockTitle]
+inherits=PanelButtonCommand
+frame=false
+interior=false
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.bold=false
+
+[IndicatorSpinBox]
+inherits=PanelButtonCommand
+frame=true
+interior=true
+frame.top=2
+frame.bottom=2
+frame.left=2
+frame.right=2
+indicator.element=spin
+indicator.size=8
+text.normal.color={on_surface}
+text.margin.top=2
+text.margin.bottom=2
+text.margin.left=2
+text.margin.right=2
+
+[RadioButton]
+inherits=PanelButtonCommand
+frame=false
+interior.element=radio
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+min_width=+0.3font
+min_height=+0.3font
+
+[CheckBox]
+inherits=PanelButtonCommand
+frame=false
+interior.element=checkbox
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+min_width=+0.3font
+min_height=+0.3font
+
+[Focus]
+inherits=PanelButtonCommand
+frame=true
+frame.element=focus
+frame.top=2
+frame.bottom=2
+frame.left=2
+frame.right=2
+frame.patternsize=14
+
+[GenericFrame]
+inherits=PanelButtonCommand
+frame=true
+interior=false
+frame.element=common
+interior.element=common
+frame.top=1
+frame.bottom=1
+frame.left=1
+frame.right=1
+
+[LineEdit]
+inherits=PanelButtonCommand
+frame.element=lineedit
+interior.element=lineedit
+frame.top=6
+frame.bottom=6
+frame.left=6
+frame.right=6
+text.margin.top=2
+text.margin.bottom=2
+text.margin.left=2
+text.margin.right=2
+
+[ToolbarLineEdit]
+frame.element=lineedit
+interior.element=lineedit
+
+[DropDownButton]
+inherits=PanelButtonCommand
+indicator.element=arrow-down
+
+[IndicatorArrow]
+indicator.element=arrow
+indicator.size=8
+
+[ToolboxTab]
+inherits=PanelButtonCommand
+text.normal.color={on_surface}
+text.press.color={on_surface}
+text.focus.color={on_surface}
+
+[Tab]
+inherits=PanelButtonCommand
+interior.element=tab
+text.margin.left=8
+text.margin.right=8
+text.margin.top=0
+text.margin.bottom=0
+frame.element=tab
+indicator.element=tab
+indicator.size=22
+frame.top=8
+frame.bottom=8
+frame.left=8
+frame.right=8
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+frame.expansion=0
+text.bold=false
+
+[TabFrame]
+inherits=PanelButtonCommand
+frame.element=tabframe
+interior.element=tabframe
+frame.top=6
+frame.bottom=6
+frame.left=6
+frame.right=6
+
+[TreeExpander]
+inherits=PanelButtonCommand
+indicator.size=8
+indicator.element=tree
+
+[HeaderSection]
+inherits=PanelButtonCommand
+interior.element=header
+frame.element=header
+frame.top=0
+frame.bottom=1
+frame.left=1
+frame.right=1
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+frame.expansion=0
+
+[SizeGrip]
+indicator.element=resize-grip
+
+[Toolbar]
+inherits=PanelButtonCommand
+indicator.element=toolbar
+indicator.size=5
+text.margin=0
+interior.element=menubar
+frame.element=menubar
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+frame.left=6
+frame.right=6
+frame.top=0
+frame.bottom=1
+frame.expansion=0
+
+[Slider]
+inherits=PanelButtonCommand
+frame.element=slider
+focusFrame=true
+interior.element=slider
+frame.top=3
+frame.bottom=3
+frame.left=3
+frame.right=3
+
+[SliderCursor]
+inherits=PanelButtonCommand
+frame=false
+interior.element=slidercursor
+
+[Progressbar]
+inherits=PanelButtonCommand
+frame.element=progress
+interior.element=progress
+text.margin=0
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+text.bold=false
+frame.expansion=8
+
+[ProgressbarContents]
+inherits=PanelButtonCommand
+frame=true
+frame.element=progress-pattern
+interior.element=progress-pattern
+
+[ItemView]
+inherits=PanelButtonCommand
+text.margin=0
+frame.element=itemview
+interior.element=itemview
+frame.top=4
+frame.bottom=4
+frame.left=4
+frame.right=4
+text.margin.top=0
+text.margin.bottom=0
+text.margin.left=8
+text.margin.right=8
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+min_width=+0.3font
+min_height=+0.3font
+frame.expansion=0
+
+[Splitter]
+interior.element=splitter
+frame=false
+indicator.size=0
+
+[Scrollbar]
+inherits=PanelButtonCommand
+indicator.element=arrow
+indicator.size=12
+
+[ScrollbarSlider]
+inherits=PanelButtonCommand
+frame.element=scrollbarslider
+interior=false
+frame.left=5
+frame.right=5
+frame.top=5
+frame.bottom=5
+indicator.element=grip
+indicator.size=12
+
+[ScrollbarGroove]
+inherits=PanelButtonCommand
+interior=false
+frame=false
+
+[Menu]
+inherits=PanelButtonCommand
+frame.top=10
+frame.bottom=10
+frame.left=10
+frame.right=10
+frame.element=menu
+interior.element=menu
+text.normal.color={on_surface}
+text.shadow=false
+frame.expansion=0
+text.bold=false
+
+[MenuItem]
+inherits=PanelButtonCommand
+frame=true
+frame.element=menuitem
+interior.element=menuitem
+indicator.element=menuitem
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.margin.top=0
+text.margin.bottom=0
+text.margin.left=6
+text.margin.right=6
+frame.top=4
+frame.bottom=4
+frame.left=4
+frame.right=4
+text.bold=false
+frame.expansion=0
+
+[MenuBar]
+inherits=PanelButtonCommand
+frame.element=menubar
+interior.element=menubar
+frame.bottom=0
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+frame.expansion=0
+text.bold=false
+
+[MenuBarItem]
+inherits=PanelButtonCommand
+interior=true
+interior.element=menubaritem
+frame.element=menubaritem
+frame.top=2
+frame.bottom=2
+frame.left=2
+frame.right=2
+text.margin.left=4
+text.margin.right=4
+text.margin.top=0
+text.margin.bottom=0
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+text.bold=false
+min_width=+0.3font
+min_height=+0.3font
+frame.expansion=0
+
+[TitleBar]
+inherits=PanelButtonCommand
+frame=false
+text.margin.top=2
+text.margin.bottom=2
+text.margin.left=2
+text.margin.right=2
+interior.element=titlebar
+indicator.size=16
+indicator.element=mdi
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.bold=false
+text.italic=true
+frame.expansion=0
+
+[ComboBox]
+inherits=PanelButtonCommand
+frame.element=combo
+interior.element=combo
+frame.top=6
+frame.bottom=6
+frame.left=6
+frame.right=6
+text.margin.top=2
+text.margin.bottom=2
+text.margin.left=2
+text.margin.right=2
+text.focus.color={on_surface}
+text.press.color={on_surface}
+text.toggle.color={on_surface}
+
+[GroupBox]
+inherits=GenericFrame
+frame=false
+text.shadow=0
+text.margin=0
+text.normal.color={on_surface}
+text.focus.color={on_surface}
+text.bold=false
+frame.expansion=0
+
+[TabBarFrame]
+inherits=GenericFrame
+frame=false
+frame.element=tabBarFrame
+interior=false
+frame.top=0
+frame.bottom=0
+frame.left=0
+frame.right=0
+
+[ToolTip]
+inherits=GenericFrame
+frame.top=6
+frame.bottom=6
+frame.left=6
+frame.right=6
+interior=true
+text.shadow=0
+text.margin=6
+interior.element=tooltip
+frame.element=tooltip
+frame.expansion=6
+
+[StatusBar]
+inherits=GenericFrame
+frame=false
+interior=false
+
+[Window]
+interior=true
+interior.element=window
+frame=true
+frame.element=window
+frame.bottom=10
+frame.top=10
+
+text.disabled.color={editor_disabled}
--- a/extra/templates/kvantum/kvantum.svg
+++ b/extra/templates/kvantum/kvantum.svg
--- a/extra/templates/nvim.lua
+++ b/extra/templates/nvim.lua
@@ -0,0 +1,93 @@
+vim.cmd("highlight clear")
+vim.cmd("syntax reset")
+vim.g.colors_name = "clrsync"
+
+local palette = {
+    -- Editor colors
+    Default                 = "{editor_main.hex}",
+    Keyword                 = "{editor_command.hex}",
+    Number                  = "{editor_warning.hex}",
+    String                  = "{editor_string.hex}",
+    CharLiteral             = "{editor_string.hex}",
+    Punctuation             = "{editor_main.hex}",
+    Preprocessor            = "{editor_emphasis.hex}",
+    Identifier              = "{editor_main.hex}",
+    KnownIdentifier         = "{editor_link.hex}",
+    PreprocIdentifier       = "{editor_link.hex}",
+
+    Comment                 = "{editor_comment.hex}",
+    MultiLineComment        = "{editor_comment.hex}",
+
+    Background              = "{editor_background.hex}",
+    Cursor                  = "{cursor.hex}",
+
+    Selection               = "{editor_selected.hex}",
+    ErrorMarker             = "{editor_error.hex}",
+    Breakpoint              = "{editor_error.hex}",
+
+    LineNumber              = "{editor_line_number.hex}",
+    CurrentLineFill         = "{surface_variant.hex}",
+    CurrentLineFillInactive = "{surface.hex}",
+
+    CurrentLineEdge         = "{border_focused.hex}",
+    
+    -- Semantic colors
+    Success                 = "{success.hex}",
+    Warning                 = "{warning.hex}",
+    Error                   = "{error.hex}",
+    Info                    = "{info.hex}",
+}
+
+-- Helper function to set highlights in Neovim
+local function set_hl(group, opts)
+    vim.api.nvim_set_hl(0, group, opts)
+end
+
+vim.o.winborder = "rounded"
+
+-- Basic editor highlights using the mapped palette
+set_hl("Normal", { fg = palette.Default, bg = palette.Background })
+set_hl("CursorLine", { bg = palette.CurrentLineFill })
+set_hl("Visual", { bg = palette.Selection })
+set_hl("LineNr", { fg = palette.LineNumber })
+set_hl("CursorLineNr", { fg = palette.Keyword })
+
+-- Syntax highlights
+set_hl("Comment", { fg = palette.Comment, italic = true })
+set_hl("Constant", { fg = palette.Number })
+set_hl("String", { fg = palette.String })
+set_hl("Character", { fg = palette.CharLiteral })
+set_hl("Identifier", { fg = palette.Identifier })
+set_hl("Function", { fg = palette.Keyword })
+set_hl("Statement", { fg = palette.Keyword })
+set_hl("PreProc", { fg = palette.Preprocessor })
+set_hl("Type", { fg = palette.Keyword })
+set_hl("Special", { fg = palette.PreprocIdentifier })
+set_hl("Underlined", { fg = palette.KnownIdentifier })
+set_hl("Error", { fg = palette.ErrorMarker, bg = palette.Background })
+set_hl("Todo", { fg = palette.Default, bg = palette.Keyword })
+
+-- Floating windows
+set_hl("NormalFloat", { bg = palette.Background })
+set_hl("FloatBorder", { fg = palette.CurrentLineEdge, bg = palette.Background })
+
+-- Completion menu
+set_hl("Pmenu", { bg = palette.Background })
+set_hl("PmenuSel", { bg = palette.Keyword, fg = palette.Background })
+
+-- Git and diagnostic highlights
+set_hl("DiffAdd", { fg = palette.Success, bg = palette.Background })
+set_hl("DiffChange", { fg = palette.Keyword, bg = palette.Background })
+set_hl("DiffDelete", { fg = palette.ErrorMarker, bg = palette.Background })
+set_hl("DiagnosticError", { fg = palette.Error })
+set_hl("DiagnosticWarn", { fg = palette.Warning })
+set_hl("DiagnosticInfo", { fg = palette.Info })
+set_hl("DiagnosticHint", { fg = palette.PreprocIdentifier })
+
+-- Treesitter links
+set_hl("@comment", { link = "Comment" })
+set_hl("@string", { fg = palette.String })
+set_hl("@function", { fg = palette.Keyword })
+set_hl("@variable", { fg = palette.Identifier })
+set_hl("@keyword", { fg = palette.Keyword })
+set_hl("@type", { fg = palette.Preprocessor })
--- a/extra/templates/qtct.conf
+++ b/extra/templates/qtct.conf
@@ -0,0 +1,4 @@
+[ColorScheme]
+active_colors={on_background}, {surface}, #ffffff, #cacaca, #9f9f9f, #b8b8b8, {on_background}, #ffffff, {on_surface}, {background}, {background}, {border}, {accent}, {on_surface}, {base04}, {accent}, {surface}, {surface}, {surface}, {on_surface}, {base04}
+disabled_colors={editor_disabled}, {surface}, #ffffff, #cacaca, #9f9f9f, #b8b8b8, {editor_disabled}, #ffffff, {editor_disabled}, {background}, {background}, {border}, {surface_variant}, {on_surface_variant}, {base04}, {accent}, {surface}, {surface}, {surface}, {editor_disabled}, {base04}
+inactive_colors={on_background}, {surface}, #ffffff, #cacaca, #9f9f9f, #b8b8b8, {on_background}, #ffffff, {on_surface}, {background}, {background}, {border}, {surface_variant}, {on_surface_variant}, {base04}, {accent}, {surface}, {surface}, {surface}, {on_surface}, {base04}
--- a/extra/templates/telegram.tdesktop-theme
+++ b/extra/templates/telegram.tdesktop-theme
@@ -0,0 +1,213 @@
+// Template mostly stolen from noctalia-shell 
+// https://github.com/noctalia-dev/noctalia-shell/blob/main/Assets/MatugenTemplates/telegram.tdesktop-theme
+
+COLOR_GRAY: {border};
+COLOR_DARK: {surface_variant};
+
+windowBg: {background}; // Main background
+windowFg: {on_background}; // Main text
+windowBgOver: {surface_variant}; // Generic background on hover
+windowBgRipple: {surface_variant}; // Ripple effect
+windowFgOver: {on_surface_variant}; // Text on hover
+windowSubTextFg: {foreground}60; // Minor text
+windowSubTextFgOver: {foreground}80; // Minor text on hover
+
+dialogsBg: {background}; // Sidebar background
+dialogsBgActive: {surface}; // Active chat background
+dialogsBgOver: {surface_variant}; // Hover background
+dialogsRippleBg: {surface_variant}; // Ripple effect
+dialogsRippleBgActive: {surface_variant}; // Ripple effect for active chat
+
+dialogsNameFg: {foreground}; // Chat name
+dialogsNameFgActive: {foreground}; // Chat name for active chat
+dialogsNameFgOver: {foreground}; // Chat name on hover
+
+dialogsTextFg: {foreground}; // Message preview
+dialogsTextFgActive: {foreground}; // Message preview for active chat
+dialogsTextFgOver: {foreground}; // Message preview on hover
+
+dialogsTextFgService: {foreground}; // Service text (group sender name)
+dialogsTextFgServiceActive: {foreground}; // Service text for active chat
+dialogsTextFgServiceOver: {foreground}; // Service text on hover
+
+dialogsDateFg: {foreground}60; // Date text
+dialogsDateFgActive: {foreground}60; // Date text for active chat
+dialogsDateFgOver: {foreground}60; // Date text on hover
+
+dialogsDraftFg: {foreground}; // Draft label
+dialogsDraftFgActive: {foreground}; // Draft label for active chat
+dialogsDraftFgOver: {foreground}; // Draft label on hover
+
+dialogsVerifiedIconBg: {accent}; // Verified badge background
+dialogsVerifiedIconBgActive: {accent}; // Verified badge for active chat
+dialogsVerifiedIconBgOver: {accent}; // Verified badge on hover
+dialogsVerifiedIconFg: {background}; // Verified icon
+dialogsVerifiedIconFgActive: {background}; // Verified icon for active chat
+dialogsVerifiedIconFgOver: {background}; // Verified icon on hover
+
+dialogsSendingIconFg: {foreground}; // Sending icon (clock)
+dialogsSendingIconFgActive: {foreground}; // Sending icon for active chat
+dialogsSendingIconFgOver: {foreground}; // Sending icon on hover
+
+dialogsSentIconFg: {accent}; // Sent icon (tick)
+dialogsSentIconFgActive: {accent}; // Sent icon for active chat
+dialogsSentIconFgOver: {accent}; // Sent icon on hover
+
+dialogsUnreadBg: {accent}; // Unread badge background
+dialogsUnreadBgActive: {accent}; // Unread badge for active chat
+dialogsUnreadBgOver: {accent}; // Unread badge on hover
+dialogsUnreadBgMuted: {foreground}; // Muted unread badge
+dialogsUnreadBgMutedActive: {foreground}; // Muted unread badge for active chat
+dialogsUnreadBgMutedOver: {foreground}; // Muted unread badge on hover
+dialogsUnreadFg: {background}; // Unread badge text
+dialogsUnreadFgActive: {background}; // Unread badge text for active chat
+dialogsUnreadFgOver: {background}; // Unread badge text on hover
+
+dialogsChatIconFg: {foreground}; // Group/channel icon
+dialogsChatIconFgActive: {foreground}; // Group/channel icon for active chat
+dialogsChatIconFgOver: {foreground}; // Group/channel icon on hover
+
+dialogsOnlineBadgeFg: {foreground}; // Online status
+dialogsOnlineBadgeFgActive: {foreground}; // Online status for active chat
+
+dialogsForwardBg: {surface}; // Forwarding panel background
+dialogsForwardFg: {foreground}; // Forwarding panel text
+
+dialogsMenuIconFg: {foreground}; // Main menu icon
+dialogsMenuIconFgOver: {foreground}60; // Main menu icon on hover
+windowBoldFg: {on_background}; // Bold text
+windowBoldFgOver: {on_surface_variant}; // Bold text on hover
+windowBgActive: {surface}; // Active items background
+windowFgActive: {foreground}; // Active items text
+windowActiveTextFg: {accent}; // Active items text
+windowShadowFg: {border}; // Window shadow
+windowShadowFgFallback: {border}; // Fallback for shadow
+historyOutIconFg: {accent};
+historyIconFgInverted: {on_surface};
+
+msgServiceBg: {surface}80;
+msgServiceFg: {foreground};
+msgOutBg: {surface};
+msgOutBgSelected: {surface_variant};
+msgOutServiceFg: {on_surface};
+msgOutDateFg: {foreground}80;
+historySentIconFg: {foreground};
+msgOutDateFgSelected: {foreground};
+msgInBg: {surface_variant};
+msgInBgSelected: {surface};
+msgDateImgFg: {on_surface};
+
+
+shadowFg: {border}; // General shadow
+slideFadeOutBg: {background};
+slideFadeOutShadowFg: {border};
+
+imageBg: {surface};
+imageBgTransparent: {surface};
+
+activeButtonBg: {accent}; // Active button background
+activeButtonBgOver: {surface_variant}; // Active button hover background
+activeButtonBgRipple: {on_surface_variant}; // Active button ripple
+activeButtonFg: {on_background}; // Active button text
+activeButtonFgOver: {on_surface_variant}; // Active button hover text
+activeButtonSecondaryFg: {on_background}; // Active button secondary text
+activeButtonSecondaryFgOver: {on_surface_variant}; // Active button secondary hover text
+activeLineFg: {accent};
+dialogsBgActive: {surface};
+
+lightButtonBg: {surface}; // Light button background
+lightButtonBgOver: {surface_variant}; // Light button hover background
+lightButtonBgRipple: {accent}; // Light button ripple
+lightButtonFg: {on_surface}; // Light button text
+lightButtonFgOver: {on_surface_variant}; // Light button hover text
+
+attentionButtonFg: {error};
+attentionButtonFgOver: {error};
+attentionButtonBgOver: {surface_variant};
+attentionButtonBgRipple: {on_surface};
+
+outlineButtonBg: {surface}; // Outline button background
+outlineButtonBgOver: {surface_variant}; // Outline button hover background
+outlineButtonOutlineFg: {accent}; // Outline button color
+outlineButtonBgRipple: {accent}; // Outline button ripple
+
+menuBg: {surface};
+menuBgOver: {surface_variant};
+menuBgRipple: {accent};
+menuIconFg: {on_surface};
+menuIconFgOver: {on_surface_variant};
+menuSubmenuArrowFg: {border};
+menuFgDisabled: {border};
+menuSeparatorFg: {border};
+
+scrollBarBg: {accent}40; // Scroll bar background (40% opacity)
+scrollBarBgOver: {accent}60; // Scroll bar hover background (60% opacity)
+scrollBg: {surface_variant}40; // Scroll bar track (40% opacity)
+scrollBgOver: {surface_variant}60; // Scroll bar track on hover (60% opacity)
+
+smallCloseIconFg: {border};
+smallCloseIconFgOver: {on_surface_variant};
+
+radialFg: {accent};
+radialBg: {surface};
+
+placeholderFg: {border}; // Placeholder text
+placeholderFgActive: {accent}; // Active placeholder text
+inputBorderFg: {border}; // Input border
+filterInputBorderFg: {border}; // Search input border
+filterInputInactiveBg: {surface}; // Inactive search input background
+checkboxFg: {accent}; // Checkbox color
+
+// Filters sidebar (left side bar with folder filters)
+sideBarBg: {surface}; // Filters sidebar background
+sideBarBgActive: {surface_variant}; // Filters sidebar active filter background
+sideBarBgRipple: {background}; // Filters sidebar ripple effect
+sideBarTextFg: {foreground}; // Filters sidebar text
+sideBarTextFgActive: {foreground}; // Filters sidebar active filter text
+sideBarIconFg: {foreground}; // Filters sidebar icon
+sideBarIconFgActive: {foreground}; // Filters sidebar active filter icon
+sideBarBadgeBg: {accent}; // Filters sidebar badge background
+sideBarBadgeBgMuted: {foreground}60; // Filters sidebar muted badge background
+
+titleBg: {surface}; // Window title background
+titleShadow: {border};
+titleButtonFg: {on_surface}; // Title button color
+titleButtonBgOver: {surface_variant}; // Title button hover background
+titleButtonFgOver: {on_surface_variant}; // Title button hover color
+titleButtonCloseBgOver: {error};
+titleButtonCloseFgOver: {on_error};
+titleFgActive: {on_surface}; // Active title text
+titleFg: {on_surface}; // Inactive title text
+
+trayCounterBg: {error}; // Tray counter background
+trayCounterBgMute: {border}; // Muted tray counter background
+trayCounterFg: {on_error}; // Tray counter text
+trayCounterBgMacInvert: {error}; // Mac tray counter
+trayCounterFgMacInvert: {on_error}; // Mac tray counter text
+
+layerBg: {surface}99; // Layer background (60% opacity)
+
+cancelIconFg: {error}; // Cancel icon
+cancelIconFgOver: {error}; // Cancel icon on hover
+
+boxBg: {surface}; // Box background
+boxTextFg: {on_surface}; // Box text
+boxTextFgGood: {accent}; // Box good text
+boxTextFgError: {error}; // Box error text
+boxTitleFg: {on_surface}; // Box title text
+boxSearchBg: {surface}; // Box search field background
+boxSearchCancelIconFg: {error}; // Box search cancel icon
+boxSearchCancelIconFgOver: {error}; // Box search cancel icon on hover
+
+contactsBg: {surface}; // Contacts background
+contactsBgOver: {surface_variant}; // Contacts background on hover
+contactsNameFg: {on_surface}; // Contact name
+contactsStatusFg: {border}; // Contact status
+contactsStatusFgOver: {on_surface_variant}; // Contact status on hover
+contactsStatusFgOnline: {accent}; // Online contact status
+
+photoCropFadeBg: {surface}cc; // Photo crop fade background
+photoCropPointFg: {accent}; // Photo crop points
+
+chat_inBubbleSelected: {surface_variant}; // inbox selected chat background
+chat_outBubbleSelected: {surface_variant}; // outbox selected chat background
--- a/extra/templates/userChrome.css
+++ b/extra/templates/userChrome.css
@@ -0,0 +1,109 @@
+/* clrsync Firefox Theme */
+/* Place in: <Firefox Profile>/chrome/userChrome.css */
+/* Enable: about:config -> toolkit.legacyUserProfileCustomizations.stylesheets = true */
+
+:root {
+  --lwt-accent-color: {background} !important;
+  --lwt-text-color: {foreground} !important;
+
+  --toolbar-bgcolor: {surface} !important;
+  --toolbar-color: {on_surface} !important;
+  --toolbarbutton-hover-background: {surface_variant} !important;
+  --toolbarbutton-active-background: {border_focused} !important;
+  --toolbarbutton-icon-fill: {on_surface} !important;
+
+  --tab-selected-bgcolor: {surface} !important;
+  --tab-selected-textcolor: {foreground} !important;
+  --tab-loading-fill: {accent} !important;
+  --lwt-tab-text: {foreground} !important;
+  --tab-line-color: {accent} !important;
+
+  --urlbar-box-bgcolor: {surface_variant} !important;
+  --urlbar-box-text-color: {on_surface} !important;
+  --urlbar-box-hover-bgcolor: {surface} !important;
+  --urlbar-box-focus-bgcolor: {surface} !important;
+  --urlbar-popup-url-color: {editor_link} !important;
+
+  --arrowpanel-background: {surface} !important;
+  --arrowpanel-color: {on_surface} !important;
+  --arrowpanel-border-color: {border} !important;
+  --panel-separator-color: {border} !important;
+
+  --sidebar-background-color: {background} !important;
+  --sidebar-text-color: {foreground} !important;
+  --sidebar-border-color: {border} !important;
+
+  --toolbar-field-focus-background-color: {surface} !important;
+  --toolbar-field-focus-color: {on_surface} !important;
+  --toolbar-field-focus-border-color: {accent} !important;
+}
+
+#TabsToolbar {
+  background-color: {background} !important;
+}
+
+.tab-background[selected="true"] {
+  background-color: {surface} !important;
+}
+
+.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"]) {
+  background-color: {surface_variant} !important;
+}
+
+.tab-line {
+  background-color: {accent} !important;
+}
+
+#nav-bar {
+  background-color: {surface} !important;
+}
+
+#urlbar-background {
+  background-color: {surface_variant} !important;
+  border-color: {border} !important;
+}
+
+#urlbar[focused="true"] > #urlbar-background {
+  background-color: {surface} !important;
+  border-color: {accent} !important;
+}
+
+#urlbar-input {
+  color: {on_surface} !important;
+}
+
+#PersonalToolbar {
+  background-color: {surface} !important;
+}
+
+menupopup, panel {
+  --panel-background: {surface} !important;
+  --panel-color: {on_surface} !important;
+}
+
+menupopup {
+  background-color: {surface} !important;
+  color: {on_surface} !important;
+}
+
+menuitem:hover, menu:hover {
+  background-color: {surface_variant} !important;
+}
+
+#sidebar-box {
+  background-color: {background} !important;
+}
+
+#sidebar-header {
+  background-color: {surface} !important;
+  border-bottom-color: {border} !important;
+}
+
+findbar {
+  background-color: {surface} !important;
+  color: {on_surface} !important;
+}
+
+* {
+  scrollbar-color: {surface_variant} {background} !important;
+}
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1764950072,
-        "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
+        "lastModified": 1765779637,
+        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f61125a668a320878494449750330ca58b78c557",
+        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
        "type": "github"
      },
      "original": {
--- a/src/cli/main.cpp
+++ b/src/cli/main.cpp
@@ -4,15 +4,15 @@

 #include <argparse/argparse.hpp>

-#include <core/config/config.hpp>
-#include <core/error.hpp>
-#include <core/io/toml_file.hpp>
-#include <core/palette/palette_file.hpp>
-#include <core/palette/palette_manager.hpp>
-#include <core/theme/theme_renderer.hpp>
-#include <core/theme/theme_template.hpp>
-#include <core/utils.hpp>
-#include <core/version.hpp>
+#include "core/common/error.hpp"
+#include "core/common/utils.hpp"
+#include "core/common/version.hpp"
+#include "core/config/config.hpp"
+#include "core/io/toml_file.hpp"
+#include "core/palette/palette_file.hpp"
+#include "core/palette/palette_manager.hpp"
+#include "core/theme/theme_renderer.hpp"
+#include "core/theme/theme_template.hpp"

 void handle_show_vars()
 {
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -2,8 +2,8 @@ set(CORE_SOURCES
    palette/color.cpp
    io/toml_file.cpp
    config/config.cpp
-    utils.cpp
-    version.cpp
+        common/utils.cpp
+        common/version.cpp
    theme/theme_template.cpp
 )

--- a/src/core/common/error.hpp
+++ b/src/core/common/error.hpp
@@ -0,0 +1,266 @@
+#ifndef CLRSYNC_CORE_ERROR_HPP
+#define CLRSYNC_CORE_ERROR_HPP
+
+#include <optional>
+#include <string>
+#include <variant>
+
+namespace clrsync::core
+{
+
+enum class error_code
+{
+    unknown,
+
+    file_not_found,
+    file_open_failed,
+    file_write_failed,
+    file_read_failed,
+    dir_create_failed,
+
+    parse_failed,
+    invalid_format,
+
+    config_missing,
+    config_invalid,
+
+    template_not_found,
+    template_load_failed,
+    template_apply_failed,
+
+    palette_not_found,
+    palette_load_failed,
+
+    init_failed,
+    invalid_arg,
+    resource_missing,
+};
+
+inline const char *error_code_string(error_code code)
+{
+    switch (code)
+    {
+    case error_code::unknown:
+        return "Unknown error";
+    case error_code::file_not_found:
+        return "File not found";
+    case error_code::file_open_failed:
+        return "Failed to open file";
+    case error_code::file_write_failed:
+        return "Failed to write file";
+    case error_code::file_read_failed:
+        return "Failed to read file";
+    case error_code::dir_create_failed:
+        return "Failed to create directory";
+    case error_code::parse_failed:
+        return "Parse failed";
+    case error_code::invalid_format:
+        return "Invalid format";
+    case error_code::config_missing:
+        return "Configuration missing";
+    case error_code::config_invalid:
+        return "Configuration invalid";
+    case error_code::template_not_found:
+        return "Template not found";
+    case error_code::template_load_failed:
+        return "Failed to load template";
+    case error_code::template_apply_failed:
+        return "Failed to apply template";
+    case error_code::palette_not_found:
+        return "Palette not found";
+    case error_code::palette_load_failed:
+        return "Failed to load palette";
+    case error_code::init_failed:
+        return "Initialization failed";
+    case error_code::invalid_arg:
+        return "Invalid argument";
+    case error_code::resource_missing:
+        return "Resource missing";
+    default:
+        return "Unknown error code";
+    }
+}
+
+struct Error
+{
+    error_code code;
+    std::string message;
+    std::string context;
+
+    Error(error_code c) : code(c), message(error_code_string(c))
+    {
+    }
+
+    Error(error_code c, std::string msg) : code(c), message(std::move(msg))
+    {
+    }
+
+    Error(error_code c, std::string msg, std::string ctx)
+        : code(c), message(std::move(msg)), context(std::move(ctx))
+    {
+    }
+
+    std::string description() const
+    {
+        if (context.empty())
+            return message;
+        return message + " [" + context + "]";
+    }
+};
+
+template <typename T> class [[nodiscard]] Result
+{
+  private:
+    std::variant<T, Error> m_data;
+
+  public:
+    Result(T value) : m_data(std::move(value))
+    {
+    }
+
+    Result(Error error) : m_data(std::move(error))
+    {
+    }
+
+    bool is_ok() const
+    {
+        return std::holds_alternative<T>(m_data);
+    }
+
+    bool is_error() const
+    {
+        return std::holds_alternative<Error>(m_data);
+    }
+
+    explicit operator bool() const
+    {
+        return is_ok();
+    }
+
+    T &value() &
+    {
+        return std::get<T>(m_data);
+    }
+    const T &value() const &
+    {
+        return std::get<T>(m_data);
+    }
+    T &&value() &&
+    {
+        return std::get<T>(std::move(m_data));
+    }
+
+    const Error &error() const
+    {
+        return std::get<Error>(m_data);
+    }
+
+    T value_or(T default_value) const
+    {
+        return is_ok() ? std::get<T>(m_data) : std::move(default_value);
+    }
+
+    std::optional<T> ok() const
+    {
+        if (is_ok())
+            return std::get<T>(m_data);
+        return std::nullopt;
+    }
+
+    std::optional<Error> err() const
+    {
+        if (is_error())
+            return std::get<Error>(m_data);
+        return std::nullopt;
+    }
+
+    template <typename F> auto map(F &&func) -> Result<decltype(func(std::declval<T>()))>
+    {
+        using U = decltype(func(std::declval<T>()));
+        if (is_ok())
+            return Result<U>(func(std::get<T>(m_data)));
+        return Result<U>(std::get<Error>(m_data));
+    }
+
+    template <typename F> auto and_then(F &&func) -> decltype(func(std::declval<T>()))
+    {
+        if (is_ok())
+            return func(std::get<T>(m_data));
+        using ResultType = decltype(func(std::declval<T>()));
+        return ResultType(std::get<Error>(m_data));
+    }
+};
+
+template <> class [[nodiscard]] Result<void>
+{
+  private:
+    std::optional<Error> m_error;
+
+  public:
+    Result() : m_error(std::nullopt)
+    {
+    }
+
+    Result(Error error) : m_error(std::move(error))
+    {
+    }
+
+    bool is_ok() const
+    {
+        return !m_error.has_value();
+    }
+
+    bool is_error() const
+    {
+        return m_error.has_value();
+    }
+
+    explicit operator bool() const
+    {
+        return is_ok();
+    }
+
+    const Error &error() const
+    {
+        return *m_error;
+    }
+
+    std::optional<Error> err() const
+    {
+        return m_error;
+    }
+};
+
+template <typename T> Result<T> Ok(T value)
+{
+    return Result<T>(std::move(value));
+}
+
+inline Result<void> Ok()
+{
+    return Result<void>();
+}
+
+template <typename T> Result<T> Err(Error error)
+{
+    return Result<T>(std::move(error));
+}
+
+template <typename T> Result<T> Err(error_code code)
+{
+    return Result<T>(Error(code));
+}
+
+template <typename T> Result<T> Err(error_code code, std::string message)
+{
+    return Result<T>(Error(code, std::move(message)));
+}
+
+template <typename T> Result<T> Err(error_code code, std::string message, std::string context)
+{
+    return Result<T>(Error(code, std::move(message), std::move(context)));
+}
+
+} // namespace clrsync::core
+
+#endif // CLRSYNC_CORE_ERROR_HPP
--- a/src/core/common/utils.cpp
+++ b/src/core/common/utils.cpp
@@ -1,6 +1,6 @@
 #include "utils.hpp"
-#include <iostream>
 #include <filesystem>
+#include <iostream>

 namespace clrsync::core
 {
--- a/src/core/common/utils.hpp
+++ b/src/core/common/utils.hpp
@@ -1,10 +1,10 @@
 #ifndef CLRSYNC_CORE_UTILS_HPP
 #define CLRSYNC_CORE_UTILS_HPP

-#include <string>
 #include <filesystem>
+#include <string>

-#include <core/palette/color_keys.hpp>
+#include "core/palette/color_keys.hpp"

 namespace clrsync::core
 {
--- a/src/core/common/version.cpp
+++ b/src/core/common/version.cpp
@@ -1,4 +1,4 @@
-#include "version.hpp"
+#include "core/common/version.hpp"

 namespace clrsync::core
 {
--- a/src/core/common/version.hpp
+++ b/src/core/common/version.hpp
@@ -6,7 +6,7 @@
 namespace clrsync::core
 {

-const std::string GIT_SEMVER = "0.1.6+git.g1a1747a";
+const std::string GIT_SEMVER = "1.0.3+git.gd852d58";

 const std::string version_string();
 } // namespace clrsync::core
--- a/src/core/common/version.hpp.in
+++ b/src/core/common/version.hpp.in
--- a/src/core/config/config.cpp
+++ b/src/core/config/config.cpp
@@ -1,8 +1,9 @@
 #include "config.hpp"
-#include "core/utils.hpp"
-#include "core/error.hpp"
+#include "core/common/error.hpp"
+#include "core/common/utils.hpp"
+#include "core/io/toml_file.hpp"

-#include <core/palette/color.hpp>
+#include "core/palette/color.hpp"
 #include <filesystem>
 #include <fstream>

@@ -28,7 +29,39 @@ Result<void> config::initialize(std::unique_ptr<clrsync::core::io::file> file)

    auto parse_result = m_file->parse();
    if (!parse_result)
-        return Err<void>(error_code::config_invalid, parse_result.error().message, parse_result.error().context);
+        return Err<void>(error_code::config_invalid, parse_result.error().message,
+                         parse_result.error().context);
+
+    std::filesystem::path config_path = get_user_config_dir() / "config.toml";
+    std::filesystem::path temp_config_path = get_user_config_dir() / "config-temp.toml";
+    
+    if (std::filesystem::exists(config_path))
+    {
+        std::error_code ec;
+        auto perms = std::filesystem::status(config_path, ec).permissions();
+        
+        if (ec || (perms & std::filesystem::perms::owner_write) == std::filesystem::perms::none)
+        {
+            m_temp_config_path = temp_config_path.string();
+            
+            if (std::filesystem::exists(temp_config_path))
+            {
+                try
+                {
+                    auto temp_conf = std::make_unique<clrsync::core::io::toml_file>(temp_config_path.string());
+                    auto temp_parse = temp_conf->parse();
+                    if (temp_parse)
+                    {
+                        m_temp_file = std::move(temp_conf);
+                    }
+                }
+                catch (const std::exception &e)
+                {
+                    std::cerr << "Warning: Failed to load temp config: " << e.what() << std::endl;
+                }
+            }
+        }
+    }

    return Ok();
 }
@@ -39,6 +72,30 @@ std::filesystem::path config::get_user_config_dir()
    return home / ".config" / "clrsync";
 }

+std::filesystem::path config::get_user_state_dir()
+{
+    std::filesystem::path home = normalize_path("~");
+    return home / ".local" / "state" / "clrsync";
+}
+
+std::filesystem::path config::get_writable_config_path()
+{
+    std::filesystem::path config_path = get_user_config_dir() / "config.toml";
+    
+    if (std::filesystem::exists(config_path))
+    {
+        std::error_code ec;
+        auto perms = std::filesystem::status(config_path, ec).permissions();
+        
+        if (ec || (perms & std::filesystem::perms::owner_write) == std::filesystem::perms::none)
+        {
+            return get_user_config_dir() / "config-temp.toml";
+        }
+    }
+    
+    return config_path;
+}
+
 std::filesystem::path config::get_data_dir()
 {
    if (std::filesystem::exists(CLRSYNC_DATADIR))
@@ -134,15 +191,50 @@ void config::copy_default_configs()
    }
 }

+Result<void> config::save_config_value(const std::string &section, const std::string &key, const value_type &value)
+{
+    if (!m_temp_config_path.empty())
+    {
+        if (!m_temp_file)
+        {
+            m_temp_file = std::make_unique<clrsync::core::io::toml_file>(m_temp_config_path);
+            (void)m_temp_file->parse();
+        }
+        
+        m_temp_file->set_value(section, key, value);
+        return m_temp_file->save_file();
+    }
+    
+    m_file->set_value(section, key, value);
+    return m_file->save_file();
+}
+
 const std::string &config::palettes_path()
 {
    if (m_palettes_dir.empty() && m_file)
+    {
+        if (m_temp_file)
+        {
+            auto temp_value = m_temp_file->get_string_value("general", "palettes_path");
+            if (!temp_value.empty())
+            {
+                m_palettes_dir = temp_value;
+                return m_palettes_dir;
+            }
+        }
        m_palettes_dir = m_file->get_string_value("general", "palettes_path");
+    }
    return m_palettes_dir;
 }

 const std::string config::default_theme() const
 {
+    if (m_temp_file)
+    {
+        auto temp_value = m_temp_file->get_string_value("general", "default_theme");
+        if (!temp_value.empty())
+            return temp_value;
+    }
    if (m_file)
        return m_file->get_string_value("general", "default_theme");
    return {};
@@ -150,6 +242,12 @@ const std::string config::default_theme() const

 const std::string config::font() const
 {
+    if (m_temp_file)
+    {
+        auto temp_value = m_temp_file->get_string_value("general", "font");
+        if (!temp_value.empty())
+            return temp_value;
+    }
    if (m_file)
        return m_file->get_string_value("general", "font");
    return {};
@@ -157,6 +255,12 @@ const std::string config::font() const

 const uint32_t config::font_size() const
 {
+    if (m_temp_file)
+    {
+        auto temp_value = m_temp_file->get_uint_value("general", "font_size");
+        if (temp_value != 0)
+            return temp_value;
+    }
    if (m_file)
        return m_file->get_uint_value("general", "font_size");
    return 14;
@@ -167,8 +271,7 @@ Result<void> config::set_default_theme(const std::string &theme)
    if (!m_file)
        return Err<void>(error_code::config_missing, "Configuration not initialized");

-    m_file->set_value("general", "default_theme", theme);
-    return m_file->save_file();
+    return save_config_value("general", "default_theme", theme);
 }

 Result<void> config::set_palettes_path(const std::string &path)
@@ -176,8 +279,7 @@ Result<void> config::set_palettes_path(const std::string &path)
    if (!m_file)
        return Err<void>(error_code::config_missing, "Configuration not initialized");

-    m_file->set_value("general", "palettes_path", path);
-    return m_file->save_file();
+    return save_config_value("general", "palettes_path", path);
 }

 Result<void> config::set_font(const std::string &font)
@@ -185,16 +287,14 @@ Result<void> config::set_font(const std::string &font)
    if (!m_file)
        return Err<void>(error_code::config_missing, "Configuration not initialized");

-    m_file->set_value("general", "font", font);
-    return m_file->save_file();
+    return save_config_value("general", "font", font);
 }
 Result<void> config::set_font_size(int font_size)
 {
    if (!m_file)
        return Err<void>(error_code::config_missing, "Configuration not initialized");

-    m_file->set_value("general", "font_size", font_size);
-    return m_file->save_file();
+    return save_config_value("general", "font_size", static_cast<uint32_t>(font_size));
 }

 Result<void> config::update_template(const std::string &key,
@@ -204,11 +304,17 @@ Result<void> config::update_template(const std::string &key,
        return Err<void>(error_code::config_missing, "Configuration not initialized");

    m_themes[key] = theme_template;
-    m_file->set_value("templates." + key, "input_path", theme_template.template_path());
-    m_file->set_value("templates." + key, "output_path", theme_template.output_path());
-    m_file->set_value("templates." + key, "enabled", theme_template.enabled());
-    m_file->set_value("templates." + key, "reload_cmd", theme_template.reload_command());
-    return m_file->save_file();
+    
+    auto result1 = save_config_value("templates." + key, "input_path", theme_template.template_path());
+    if (!result1) return result1;
+    
+    auto result2 = save_config_value("templates." + key, "output_path", theme_template.output_path());
+    if (!result2) return result2;
+    
+    auto result3 = save_config_value("templates." + key, "enabled", theme_template.enabled());
+    if (!result3) return result3;
+    
+    return save_config_value("templates." + key, "reload_cmd", theme_template.reload_command());
 }

 Result<void> config::remove_template(const std::string &key)
@@ -223,17 +329,31 @@ Result<void> config::remove_template(const std::string &key)
    std::filesystem::path template_file = it->second.template_path();
    if (std::filesystem::exists(template_file))
    {
-        try {
+        try
+        {
            std::filesystem::remove(template_file);
-        } catch (const std::exception& e) {
-            return Err<void>(error_code::file_write_failed, "Failed to delete template file", e.what());
+        }
+        catch (const std::exception &e)
+        {
+            return Err<void>(error_code::file_write_failed, "Failed to delete template file",
+                             e.what());
        }
    }

    m_themes.erase(it);

-    m_file->remove_section("templates." + key);
+    if (!m_temp_config_path.empty())
+    {
+        if (!m_temp_file)
+        {
+            m_temp_file = std::make_unique<clrsync::core::io::toml_file>(m_temp_config_path);
+            (void)m_temp_file->parse();
+        }
+        m_temp_file->remove_section("templates." + key);
+        return m_temp_file->save_file();
+    }
    
+    m_file->remove_section("templates." + key);
    return m_file->save_file();
 }

@@ -264,14 +384,16 @@ const std::unordered_map<std::string, clrsync::core::theme_template> config::tem
    return m_themes;
 }

-Result<const clrsync::core::theme_template*> config::template_by_name(const std::string &name) const
+Result<const clrsync::core::theme_template *> config::template_by_name(
+    const std::string &name) const
 {
    auto it = m_themes.find(name);
    if (it != m_themes.end())
    {
        return Ok(&it->second);
    }
-    return Err<const clrsync::core::theme_template*>(error_code::template_not_found, "Template not found", name);
+    return Err<const clrsync::core::theme_template *>(error_code::template_not_found,
+                                                      "Template not found", name);
 }

 } // namespace clrsync::core
--- a/src/core/config/config.hpp
+++ b/src/core/config/config.hpp
@@ -1,9 +1,9 @@
 #ifndef CLRSYNC_CORE_CONFIG_HPP
 #define CLRSYNC_CORE_CONFIG_HPP

-#include <core/io/file.hpp>
-#include <core/theme/theme_template.hpp>
-#include <core/error.hpp>
+#include "core/common/error.hpp"
+#include "core/io/file.hpp"
+#include "core/theme/theme_template.hpp"
 #include <filesystem>
 #include <memory>
 #include <string>
@@ -24,7 +24,8 @@ class config
    const std::unordered_map<std::string, clrsync::core::theme_template> templates();
    Result<const clrsync::core::theme_template *> template_by_name(const std::string &name) const;
    std::filesystem::path get_user_config_dir();
-
+    std::filesystem::path get_user_state_dir();
+    std::filesystem::path get_writable_config_path();

    Result<void> set_default_theme(const std::string &theme);
    Result<void> set_palettes_path(const std::string &path);
@@ -43,7 +44,10 @@ class config

    std::string m_palettes_dir{};
    std::unique_ptr<io::file> m_file;
+    std::unique_ptr<io::file> m_temp_file; 
+    std::string m_temp_config_path;
    std::unordered_map<std::string, theme_template> m_themes{};
+    Result<void> save_config_value(const std::string &section, const std::string &key, const value_type &value);
    static void copy_file(const std::filesystem::path &src, const std::filesystem::path &dst);
    static void copy_dir(const std::filesystem::path &src, const std::filesystem::path &dst);
    void copy_default_configs();
--- a/src/core/error.hpp
+++ b/src/core/error.hpp
@@ -1,207 +0,0 @@
-#ifndef CLRSYNC_CORE_ERROR_HPP
-#define CLRSYNC_CORE_ERROR_HPP
-
-#include <string>
-#include <variant>
-#include <optional>
-
-namespace clrsync::core
-{
-
-enum class error_code
-{
-    unknown,
-    
-    file_not_found,
-    file_open_failed,
-    file_write_failed,
-    file_read_failed,
-    dir_create_failed,
-    
-    parse_failed,
-    invalid_format,
-    
-    config_missing,
-    config_invalid,
-    
-    template_not_found,
-    template_load_failed,
-    template_apply_failed,
-    
-    palette_not_found,
-    palette_load_failed,
-    
-    init_failed,
-    invalid_arg,
-    resource_missing,
-};
-
-inline const char* error_code_string(error_code code)
-{
-    switch (code)
-    {
-        case error_code::unknown: return "Unknown error";
-        case error_code::file_not_found: return "File not found";
-        case error_code::file_open_failed: return "Failed to open file";
-        case error_code::file_write_failed: return "Failed to write file";
-        case error_code::file_read_failed: return "Failed to read file";
-        case error_code::dir_create_failed: return "Failed to create directory";
-        case error_code::parse_failed: return "Parse failed";
-        case error_code::invalid_format: return "Invalid format";
-        case error_code::config_missing: return "Configuration missing";
-        case error_code::config_invalid: return "Configuration invalid";
-        case error_code::template_not_found: return "Template not found";
-        case error_code::template_load_failed: return "Failed to load template";
-        case error_code::template_apply_failed: return "Failed to apply template";
-        case error_code::palette_not_found: return "Palette not found";
-        case error_code::palette_load_failed: return "Failed to load palette";
-        case error_code::init_failed: return "Initialization failed";
-        case error_code::invalid_arg: return "Invalid argument";
-        case error_code::resource_missing: return "Resource missing";
-        default: return "Unknown error code";
-    }
-}
-
-struct Error
-{
-    error_code code;
-    std::string message;
-    std::string context;
-    
-    Error(error_code c) : code(c), message(error_code_string(c)) {}
-    
-    Error(error_code c, std::string msg) 
-        : code(c), message(std::move(msg)) {}
-    
-    Error(error_code c, std::string msg, std::string ctx)
-        : code(c), message(std::move(msg)), context(std::move(ctx)) {}
-    
-    std::string description() const
-    {
-        if (context.empty())
-            return message;
-        return message + " [" + context + "]";
-    }
-};
-
-template<typename T>
-class [[nodiscard]] Result
-{
-private:
-    std::variant<T, Error> m_data;
-    
-public:
-    Result(T value) : m_data(std::move(value)) {}
-    
-    Result(Error error) : m_data(std::move(error)) {}
-    
-    bool is_ok() const { return std::holds_alternative<T>(m_data); }
-    
-    bool is_error() const { return std::holds_alternative<Error>(m_data); }
-    
-    explicit operator bool() const { return is_ok(); }
-    
-    T& value() & { return std::get<T>(m_data); }
-    const T& value() const & { return std::get<T>(m_data); }
-    T&& value() && { return std::get<T>(std::move(m_data)); }
-    
-    const Error& error() const { return std::get<Error>(m_data); }
-    
-    T value_or(T default_value) const
-    {
-        return is_ok() ? std::get<T>(m_data) : std::move(default_value);
-    }
-    
-    std::optional<T> ok() const
-    {
-        if (is_ok())
-            return std::get<T>(m_data);
-        return std::nullopt;
-    }
-    
-    std::optional<Error> err() const
-    {
-        if (is_error())
-            return std::get<Error>(m_data);
-        return std::nullopt;
-    }
-    
-    template<typename F>
-    auto map(F&& func) -> Result<decltype(func(std::declval<T>()))>
-    {
-        using U = decltype(func(std::declval<T>()));
-        if (is_ok())
-            return Result<U>(func(std::get<T>(m_data)));
-        return Result<U>(std::get<Error>(m_data));
-    }
-    
-    template<typename F>
-    auto and_then(F&& func) -> decltype(func(std::declval<T>()))
-    {
-        if (is_ok())
-            return func(std::get<T>(m_data));
-        using ResultType = decltype(func(std::declval<T>()));
-        return ResultType(std::get<Error>(m_data));
-    }
-};
-
-template<>
-class [[nodiscard]] Result<void>
-{
-private:
-    std::optional<Error> m_error;
-    
-public:
-    Result() : m_error(std::nullopt) {}
-    
-    Result(Error error) : m_error(std::move(error)) {}
-    
-    bool is_ok() const { return !m_error.has_value(); }
-    
-    bool is_error() const { return m_error.has_value(); }
-    
-    explicit operator bool() const { return is_ok(); }
-    
-    const Error& error() const { return *m_error; }
-    
-    std::optional<Error> err() const { return m_error; }
-};
-
-template<typename T>
-Result<T> Ok(T value)
-{
-    return Result<T>(std::move(value));
-}
-
-inline Result<void> Ok()
-{
-    return Result<void>();
-}
-
-template<typename T>
-Result<T> Err(Error error)
-{
-    return Result<T>(std::move(error));
-}
-
-template<typename T>
-Result<T> Err(error_code code)
-{
-    return Result<T>(Error(code));
-}
-
-template<typename T>
-Result<T> Err(error_code code, std::string message)
-{
-    return Result<T>(Error(code, std::move(message)));
-}
-
-template<typename T>
-Result<T> Err(error_code code, std::string message, std::string context)
-{
-    return Result<T>(Error(code, std::move(message), std::move(context)));
-}
-
-} // namespace clrsync::core
-
-#endif // CLRSYNC_CORE_ERROR_HPP
--- a/src/core/io/file.hpp
+++ b/src/core/io/file.hpp
@@ -1,10 +1,10 @@
 #ifndef CLRSYNC_CORE_IO_FILE_HPP
 #define CLRSYNC_CORE_IO_FILE_HPP
+#include "core/common/error.hpp"
 #include <cstdint>
 #include <map>
 #include <string>
 #include <variant>
-#include <core/error.hpp>

 using value_type = std::variant<std::string, uint32_t, int, bool>;

@@ -16,7 +16,10 @@ class file
    file() = default;
    file(std::string path) {};
    virtual ~file() = default;
-    virtual Result<void> parse() { return Ok(); };
+    virtual Result<void> parse()
+    {
+        return Ok();
+    };
    virtual const std::string get_string_value(const std::string &section,
                                               const std::string &key) const
    {
@@ -42,7 +45,10 @@ class file
    virtual void insert_or_update_value(const std::string &section, const std::string &key,
                                        const value_type &value) {};
    virtual void remove_section(const std::string &section) {};
-    virtual Result<void> save_file() { return Ok(); };
+    virtual Result<void> save_file()
+    {
+        return Ok();
+    };
 };
 } // namespace clrsync::core::io
 #endif
--- a/src/core/io/toml_file.cpp
+++ b/src/core/io/toml_file.cpp
@@ -1,5 +1,5 @@
-#include "toml_file.hpp"
-#include "core/utils.hpp"
+#include "core/io/toml_file.hpp"
+#include "core/common/utils.hpp"
 #include <filesystem>
 #include <fstream>
 #include <vector>
@@ -113,9 +113,12 @@ void toml_file::remove_section(const std::string &section)

 Result<void> toml_file::save_file()
 {
-    try {
+    try
+    {
        std::filesystem::create_directories(std::filesystem::path(m_path).parent_path());
-    } catch (const std::exception& e) {
+    }
+    catch (const std::exception &e)
+    {
        return Err<void>(error_code::dir_create_failed, e.what(), m_path);
    }

--- a/src/core/io/toml_file.hpp
+++ b/src/core/io/toml_file.hpp
@@ -1,7 +1,7 @@
 #ifndef CLRSYNC_CORE_IO_TOML_FILE_HPP
 #define CLRSYNC_CORE_IO_TOML_FILE_HPP
-#include <core/io/file.hpp>
-#include <core/error.hpp>
+#include "core/common/error.hpp"
+#include "core/io/file.hpp"
 #include <string>
 #include <toml/toml.hpp>

--- a/src/core/palette/color.cpp
+++ b/src/core/palette/color.cpp
@@ -111,14 +111,17 @@ void color::from_hex_string(const std::string &str)
    if (str.empty() || str[0] != '#')
        throw std::invalid_argument("Invalid hex color format");

-    if (str.size() == 7) {
+    if (str.size() == 7)
+    {
        uint32_t rgb = static_cast<uint32_t>(std::stoul(str.substr(1), nullptr, 16));
        m_hex = (rgb << 8) | 0xFF;
    }
-    else if (str.size() == 9) {
+    else if (str.size() == 9)
+    {
        m_hex = static_cast<uint32_t>(std::stoul(str.substr(1), nullptr, 16));
    }
-    else {
+    else
+    {
        throw std::invalid_argument("Invalid hex color format");
    }
 }
@@ -144,23 +147,31 @@ std::string color::format(const std::string& field) const
    auto hslv = to_hsl();
    auto hslav = to_hsla();

-    if (field == "hex") return to_hex_string();
-    if (field == "hex_stripped") {
+    if (field == "hex")
+        return to_hex_string();
+    if (field == "hex_stripped")
+    {
        auto s = to_hex_string();
        return s.substr(1);
    }

-    if (field == "hexa") return to_hex_string_with_alpha();
-    if (field == "hexa_stripped") {
+    if (field == "hexa")
+        return to_hex_string_with_alpha();
+    if (field == "hexa_stripped")
+    {
        auto s = to_hex_string_with_alpha();
        return s.substr(1);
    }

-    if (field == "r") return std::to_string(rgb.r);
-    if (field == "g") return std::to_string(rgb.g);
-    if (field == "b") return std::to_string(rgb.b);
+    if (field == "r")
+        return std::to_string(rgb.r);
+    if (field == "g")
+        return std::to_string(rgb.g);
+    if (field == "b")
+        return std::to_string(rgb.b);

-    if (field == "a") {
+    if (field == "a")
+    {
        float af = rgba.a / 255.0f;
        return std::format("{:.2f}", af);
    }
@@ -169,9 +180,7 @@ std::string color::format(const std::string& field) const
        return std::format("rgb({},{},{})", rgb.r, rgb.g, rgb.b);

    if (field == "rgba")
-        return std::format("rgba({},{},{},{:.2f})",
-                           rgba.r, rgba.g, rgba.b,
-                           rgba.a / 255.0f);
+        return std::format("rgba({},{},{},{:.2f})", rgba.r, rgba.g, rgba.b, rgba.a / 255.0f);

    if (field == "h")
        return std::format("{:.0f}", hslv.h);
@@ -185,12 +194,10 @@ std::string color::format(const std::string& field) const
        return std::format("{:.2f}", hslav.a);

    if (field == "hsl")
-        return std::format("hsl({:.0f},{:.2f},{:.2f})",
-                           hslv.h, hslv.s, hslv.l);
+        return std::format("hsl({:.0f},{:.2f},{:.2f})", hslv.h, hslv.s, hslv.l);

    if (field == "hsla")
-        return std::format("hsla({:.0f},{:.2f},{:.2f},{:.2f})",
-                           hslav.h, hslav.s, hslav.l, hslav.a);
+        return std::format("hsla({:.0f},{:.2f},{:.2f},{:.2f})", hslav.h, hslav.s, hslav.l, hslav.a);

    throw std::runtime_error("Unknown color format: " + field);
 }
--- a/src/core/palette/color_keys.hpp
+++ b/src/core/palette/color_keys.hpp
@@ -3,8 +3,8 @@
 #include <cstddef>
 #include <cstdint>
 #include <iterator>
-#include <unordered_map>
 #include <string>
+#include <unordered_map>

 namespace clrsync::core
 {
--- a/src/core/palette/palette.hpp
+++ b/src/core/palette/palette.hpp
@@ -4,8 +4,8 @@
 #include <string>
 #include <unordered_map>

-#include <core/palette/color.hpp>
-#include <core/palette/color_keys.hpp>
+#include "core/palette/color.hpp"
+#include "core/palette/color_keys.hpp"

 namespace clrsync::core
 {
--- a/src/core/palette/palette_file.hpp
+++ b/src/core/palette/palette_file.hpp
@@ -5,9 +5,9 @@
 #include <cstdint>
 #include <string>

-#include <core/io/file.hpp>
-#include <core/palette/color_keys.hpp>
-#include <core/palette/palette.hpp>
+#include "core/io/file.hpp"
+#include "core/palette/color_keys.hpp"
+#include "core/palette/palette.hpp"

 #include <memory>

--- a/src/core/palette/palette_manager.hpp
+++ b/src/core/palette/palette_manager.hpp
@@ -1,14 +1,13 @@
 #ifndef CLRSYNC_CORE_PALETTE_PALETTE_MANAGER_HPP
 #define CLRSYNC_CORE_PALETTE_PALETTE_MANAGER_HPP

-#include "core/utils.hpp"
-#include <iostream>
+#include "core/common/utils.hpp"
 #include <string>
 #include <unordered_map>

-#include <core/config/config.hpp>
-#include <core/palette/palette.hpp>
-#include <core/palette/palette_file.hpp>
+#include "core/config/config.hpp"
+#include "core/palette/palette.hpp"
+#include "core/palette/palette_file.hpp"
 #include <filesystem>

 namespace clrsync::core
--- a/src/core/theme/template_manager.hpp
+++ b/src/core/theme/template_manager.hpp
@@ -1,17 +1,15 @@
 #ifndef CLRSYNC_CORE_THEME_TEMPLATE_MANAGER_HPP
 #define CLRSYNC_CORE_THEME_TEMPLATE_MANAGER_HPP

-#include <core/config/config.hpp>
-#include <core/theme/theme_template.hpp>
+#include "core/config/config.hpp"
+#include "core/theme/theme_template.hpp"
 #include <string>
 #include <unordered_map>

-
 namespace clrsync::core
 {

-template <typename FileType>
-class template_manager
+template <typename FileType> class template_manager
 {
  public:
    template_manager() = default;
--- a/src/core/theme/theme_renderer.hpp
+++ b/src/core/theme/theme_renderer.hpp
@@ -1,10 +1,12 @@
 #ifndef CLRSYNC_CORE_THEME_THEME_RENDERER_HPP
 #define CLRSYNC_CORE_THEME_THEME_RENDERER_HPP
-#include <core/config/config.hpp>
-#include <core/palette/palette_manager.hpp>
-#include <core/theme/template_manager.hpp>
-#include <core/error.hpp>
+#include "core/common/error.hpp"
+#include "core/config/config.hpp"
+#include "core/palette/palette_manager.hpp"
+#include "core/theme/template_manager.hpp"
+#include <iostream>
 #include <string>
+#include <thread>

 namespace clrsync::core
 {
@@ -57,11 +59,15 @@ template <typename FileType> class theme_renderer

            if (!tmpl.reload_command().empty())
            {
-                int result = std::system(tmpl.reload_command().c_str());
+                std::string cmd = tmpl.reload_command();
+                std::thread([cmd]() {
+                    int result = std::system(cmd.c_str());
                    if (result != 0)
                    {
-                    std::cerr << "Warning: Command " << tmpl.reload_command() << " failed with code " << result << "\n";
+                        std::cerr << "Warning: Reload command '" << cmd
+                                  << "' failed with code " << result << "\n";
                    }
+                }).detach();
            }
        }
        return Ok();
--- a/src/core/theme/theme_template.cpp
+++ b/src/core/theme/theme_template.cpp
@@ -1,5 +1,5 @@
 #include "theme_template.hpp"
-#include "core/utils.hpp"
+#include "core/common/utils.hpp"
 #include <filesystem>
 #include <fstream>
 #include <iostream>
@@ -47,13 +47,15 @@ Result<void> theme_template::load_template()
 {
    if (!std::filesystem::exists(m_template_path))
    {
-        return Err<void>(error_code::template_not_found, "Template file is missing", m_template_path);
+        return Err<void>(error_code::template_not_found, "Template file is missing",
+                         m_template_path);
    }

    std::ifstream input(m_template_path, std::ios::binary);
    if (!input)
    {
-        return Err<void>(error_code::template_load_failed, "Failed to open template file", m_template_path);
+        return Err<void>(error_code::template_load_failed, "Failed to open template file",
+                         m_template_path);
    }

    m_template_data.assign(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>());
@@ -104,13 +106,15 @@ Result<void> theme_template::save_output() const
    std::ofstream output(m_output_path, std::ios::binary);
    if (!output)
    {
-        return Err<void>(error_code::file_write_failed, "Failed to open output file for writing", m_output_path);
+        return Err<void>(error_code::file_write_failed, "Failed to open output file for writing",
+                         m_output_path);
    }

    output << m_processed_data;
    if (!output)
    {
-        return Err<void>(error_code::file_write_failed, "Failed to write to output file", m_output_path);
+        return Err<void>(error_code::file_write_failed, "Failed to write to output file",
+                         m_output_path);
    }

    return Ok();
--- a/src/core/theme/theme_template.hpp
+++ b/src/core/theme/theme_template.hpp
@@ -1,8 +1,8 @@
 #ifndef clrsync_CORE_IO_THEME_TEMPLATE_HPP
 #define clrsync_CORE_IO_THEME_TEMPLATE_HPP

-#include <core/palette/palette.hpp>
-#include <core/error.hpp>
+#include "core/common/error.hpp"
+#include "core/palette/palette.hpp"
 #include <string>

 namespace clrsync::core
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -1,22 +1,44 @@
 set(GUI_SOURCES
    main.cpp
-    color_scheme_editor.cpp
-    color_table_renderer.cpp
-    preview_renderer.cpp
-    theme_applier.cpp
-    template_editor.cpp
-    palette_controller.cpp
-    template_controller.cpp
-    imgui_helpers.cpp
-    imgui_helpers.hpp
-    about_window.cpp
-    settings_window.cpp
-    font_loader.cpp
-    file_browser.cpp
+        views/color_scheme_editor.cpp
+        views/color_table_renderer.cpp
+        views/preview_renderer.cpp
+        controllers/theme_applier.cpp
+        views/template_editor.cpp
+        controllers/palette_controller.cpp
+        controllers/template_controller.cpp
+        views/about_window.cpp
+        views/settings_window.cpp
+        widgets/colors.cpp
+        widgets/dialogs.cpp
+        widgets/palette_selector.cpp
+        widgets/input_dialog.cpp
+        widgets/action_buttons.cpp
+        widgets/styled_checkbox.cpp
+        widgets/autocomplete.cpp
+        widgets/form_field.cpp
+        widgets/error_message.cpp
+        widgets/settings_buttons.cpp
+        widgets/section_header.cpp
+        widgets/link_button.cpp
+        widgets/centered_text.cpp
+        widgets/validation_message.cpp
+        widgets/template_controls.cpp
+        layout/main_layout.cpp
+        platform/windows/font_loader_windows.cpp
+        platform/linux/font_loader_linux.cpp
+        platform/macos/font_loader_macos.cpp
+        platform/linux/file_browser_linux.cpp
+        platform/windows/file_browser_windows.cpp
        ${CMAKE_SOURCE_DIR}/lib/color_text_edit/TextEditor.cpp
+        backend/glfw_opengl.cpp
+        ui_manager.cpp
+)
+
+if(MACOS)
+    list(APPEND GUI_SOURCES
+        platform/macos/file_browser_macos.mm
    )
-if(APPLE)
-    list(APPEND GUI_SOURCES file_browser_macos.mm)
 endif()

 if(WIN32)
--- a/src/gui/about_window.cpp
+++ b/src/gui/about_window.cpp
@@ -1,96 +0,0 @@
-#include "about_window.hpp"
-#include "core/version.hpp"
-#include "imgui_helpers.hpp"
-#include "imgui.h"
-
-about_window::about_window()
-{
-}
-
-void about_window::render(const clrsync::core::palette& pal)
-{
-    if (!m_visible)
-        return;
-
-    ImGui::SetNextWindowSize(ImVec2(500, 400), ImGuiCond_FirstUseEver);
-
-    if (ImGui::Begin("About clrsync", &m_visible, ImGuiWindowFlags_NoResize))
-    {
-        const float window_width = ImGui::GetContentRegionAvail().x;
-
-        ImGui::PushFont(ImGui::GetFont());
-        const char *title = "clrsync";
-        const float title_size = ImGui::CalcTextSize(title).x;
-        ImGui::SetCursorPosX((window_width - title_size) * 0.5f);
-        ImVec4 title_color = palette_utils::get_color(pal, "info", "accent");
-        ImGui::TextColored(title_color, "%s", title);
-        ImGui::PopFont();
-
-        std::string version = "Version " + clrsync::core::version_string();
-        const float version_size = ImGui::CalcTextSize(version.c_str()).x;
-        ImGui::SetCursorPosX((window_width - version_size) * 0.5f);
-        ImVec4 subtitle_color = palette_utils::get_color(pal, "editor_inactive", "foreground");
-        ImGui::TextColored(subtitle_color, "%s", version.c_str());
-
-        ImGui::Spacing();
-        ImGui::Separator();
-        ImGui::Spacing();
-
-        ImGui::TextWrapped("A color scheme management tool.");
-
-        ImGui::Spacing();
-        ImGui::Spacing();
-
-        ImGui::Separator();
-        ImGui::Spacing();
-
-        ImGui::Text("Links:");
-
-        const float button_width = 200.0f;
-        const float spacing = ImGui::GetStyle().ItemSpacing.x;
-        const float total_width = 2.0f * button_width + spacing;
-        ImGui::SetCursorPosX((window_width - total_width) * 0.5f);
-
-        if (ImGui::Button("GitHub Repository", ImVec2(button_width, 0)))
-        {
-#ifdef _WIN32
-            system("start https://github.com/obsqrbtz/clrsync");
-#elif __APPLE__
-            system("open https://github.com/obsqrbtz/clrsync");
-#else
-            system("xdg-open https://github.com/obsqrbtz/clrsync");
-#endif
-        }
-        ImGui::SameLine();
-
-        if (ImGui::Button("Documentation", ImVec2(button_width, 0)))
-        {
-#ifdef _WIN32
-            system("start https://binarygoose.dev/projects/clrsync/overview/");
-#elif __APPLE__
-            system("open https://binarygoose.dev/projects/clrsync/overview/");
-#else
-            system("xdg-open https://binarygoose.dev/projects/clrsync/overview/");
-#endif
-        }
-
-        ImGui::Spacing();
-        ImGui::Spacing();
-        ImGui::Separator();
-        ImGui::Spacing();
-
-        ImVec4 license_color = palette_utils::get_color(pal, "editor_inactive", "foreground");
-        ImGui::TextColored(license_color, "MIT License");
-        ImGui::TextWrapped(
-            "Copyright (c) 2025 Daniel Dada\n\n"
-            "Permission is hereby granted, free of charge, to any person obtaining a copy "
-            "of this software and associated documentation files (the \"Software\"), to deal "
-            "in the Software without restriction, including without limitation the rights "
-            "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell "
-            "copies of the Software, and to permit persons to whom the Software is "
-            "furnished to do so, subject to the following conditions:\n\n"
-            "The above copyright notice and this permission notice shall be included in all "
-            "copies or substantial portions of the Software.");
-    }
-    ImGui::End();
-}
--- a/src/gui/about_window.hpp
+++ b/src/gui/about_window.hpp
@@ -1,21 +0,0 @@
-#ifndef CLRSYNC_GUI_ABOUT_WINDOW_HPP
-#define CLRSYNC_GUI_ABOUT_WINDOW_HPP
-
-#include "core/palette/palette.hpp"
-
-class about_window
-{
-public:
-    about_window();
-    void render(const clrsync::core::palette& pal);
-    void render() { render(m_default_palette); }
-    void show() { m_visible = true; }
-    void hide() { m_visible = false; }
-    bool is_visible() const { return m_visible; }
-
-private:
-    bool m_visible{false};
-    clrsync::core::palette m_default_palette;
-};
-
-#endif // CLRSYNC_GUI_ABOUT_WINDOW_HPP
--- a/src/gui/backend/backend.hpp
+++ b/src/gui/backend/backend.hpp
@@ -0,0 +1,37 @@
+#ifndef CLRSYNC_BACKEND_HPP
+#define CLRSYNC_BACKEND_HPP
+
+#include <string>
+
+namespace clrsync::gui::backend{
+
+    struct window_config{
+        std::string title = "clrsync";
+        int width = 1280;
+        int height = 720;
+        bool decorated = true;
+        bool transparent_framebuffer = true;
+        float clear_color[4] = {0.1f, 0.1f, 0.1f, 0.0f};
+    };
+    class backend_interface{
+    public:
+        virtual ~backend_interface() = default;
+
+        virtual bool initialize(const window_config& config) = 0;
+        virtual void shutdown() = 0;
+        virtual bool should_close() const = 0;
+        virtual void begin_frame() = 0;
+        virtual void end_frame() = 0;
+
+        virtual void* get_native_window() const = 0;
+        virtual void* get_graphics_context() const = 0;
+        
+        virtual bool init_imgui_backend() = 0;
+        virtual void shutdown_imgui_backend() = 0;
+        virtual void imgui_new_frame() = 0;
+        virtual void imgui_render_draw_data(void* draw_data) = 0;
+    };
+
+}
+
+#endif // CLRSYNC_BACKEND_HPP
--- a/src/gui/backend/glfw_opengl.cpp
+++ b/src/gui/backend/glfw_opengl.cpp
@@ -0,0 +1,158 @@
+#include "gui/backend/glfw_opengl.hpp"
+#include <iostream>
+#include <string>
+#include <GLFW/glfw3.h>
+#include <imgui.h>
+#include <imgui_impl_glfw.h>
+#include <imgui_impl_opengl3.h>
+
+namespace clrsync::gui::backend
+{
+
+glfw_opengl_backend::glfw_opengl_backend() = default;
+
+glfw_opengl_backend::~glfw_opengl_backend()
+{
+    glfw_opengl_backend::shutdown();
+}
+
+bool glfw_opengl_backend::initialize(const window_config &config)
+{
+    glfwSetErrorCallback([](int error, const char* description) {
+        std::cerr << "GLFW Error " << error << ": " << description << std::endl;
+    });
+    
+    if (!glfwInit())
+    {
+        std::cerr << "Failed to initialize GLFW" << std::endl;
+        return false;
+    }
+
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+#ifdef __APPLE__
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
+#else
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+#endif
+    glfwWindowHint(GLFW_RESIZABLE,GLFW_TRUE);
+    glfwWindowHint(GLFW_DECORATED, config.decorated ? GLFW_TRUE : GLFW_FALSE);
+    glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, config.transparent_framebuffer ? GLFW_TRUE : GLFW_FALSE);
+
+    m_window = glfwCreateWindow(config.width, config.height, config.title.c_str(), nullptr, nullptr);
+    if (!m_window)
+    {
+        std::cerr << "Failed to create GLFW window" << std::endl;
+        glfwTerminate();
+        return false;
+    }
+
+    glfwMakeContextCurrent(m_window);
+    glfwSwapInterval(1);
+
+    return true;
+}
+
+void glfw_opengl_backend::shutdown()
+{
+    if (m_window)
+    {
+        glfwDestroyWindow(m_window);
+        m_window = nullptr;
+    }
+    glfwTerminate();
+}
+
+bool glfw_opengl_backend::should_close() const
+{
+    return m_window && glfwWindowShouldClose(m_window);
+}
+
+void glfw_opengl_backend::begin_frame()
+{
+    glfwPollEvents();
+    
+    if (m_window)
+    {
+        int display_w, display_h;
+        glfwGetFramebufferSize(m_window, &display_w, &display_h);
+        glViewport(0, 0, display_w, display_h);
+        glClearColor(0.1f, 0.1f, 0.1f, 0.0f);
+        glClear(GL_COLOR_BUFFER_BIT);
+    }
+}
+
+void glfw_opengl_backend::end_frame()
+{
+    if (m_window)
+    {
+        glfwSwapBuffers(m_window);
+    }
+}
+
+void *glfw_opengl_backend::get_native_window() const
+{
+    return static_cast<void *>(m_window);
+}
+
+void *glfw_opengl_backend::get_graphics_context() const
+{
+    return static_cast<void *>(m_window);
+}
+
+std::string glfw_opengl_backend::get_glfw_version() const
+{
+    return glfwGetVersionString();
+}
+
+std::string glfw_opengl_backend::get_glfw_platform() const
+{
+    switch (glfwGetPlatform()) {
+        case GLFW_PLATFORM_WAYLAND: return "Wayland";
+        case GLFW_PLATFORM_X11: return "X11";
+        case GLFW_PLATFORM_COCOA: return "Cocoa";
+        case GLFW_PLATFORM_WIN32: return "Win32";
+        default: return "Unknown";
+    }
+}
+
+bool glfw_opengl_backend::init_imgui_backend()
+{
+    if (!m_window)
+        return false;
+    
+    if (!ImGui_ImplGlfw_InitForOpenGL(m_window, true))
+        return false;
+    
+#ifdef __APPLE__
+    const char* glsl_version = "#version 150";
+#else
+    const char* glsl_version = "#version 120";
+#endif
+    
+    if (!ImGui_ImplOpenGL3_Init(glsl_version))
+    {
+        ImGui_ImplGlfw_Shutdown();
+        return false;
+    }
+    
+    return true;
+}
+
+void glfw_opengl_backend::shutdown_imgui_backend()
+{
+    ImGui_ImplOpenGL3_Shutdown();
+    ImGui_ImplGlfw_Shutdown();
+}
+
+void glfw_opengl_backend::imgui_new_frame()
+{
+    ImGui_ImplOpenGL3_NewFrame();
+    ImGui_ImplGlfw_NewFrame();
+}
+
+void glfw_opengl_backend::imgui_render_draw_data(void* draw_data)
+{
+    ImGui_ImplOpenGL3_RenderDrawData(static_cast<ImDrawData*>(draw_data));
+}
+
+} // namespace clrsync::gui::backend
--- a/src/gui/backend/glfw_opengl.hpp
+++ b/src/gui/backend/glfw_opengl.hpp
@@ -0,0 +1,39 @@
+#ifndef CLRSYNC_GLFW_OPENGL_HPP
+#define CLRSYNC_GLFW_OPENGL_HPP
+
+#define GL_SILENCE_DEPRECATION
+
+#include <GLFW/glfw3.h>
+
+#include "gui/backend/backend.hpp"
+
+namespace clrsync::gui::backend{
+
+    class glfw_opengl_backend : public backend_interface{
+    public:
+        glfw_opengl_backend();
+        ~glfw_opengl_backend();
+
+        bool initialize(const window_config& config) override;
+        void shutdown() override;
+        bool should_close() const override;
+        void begin_frame() override;
+        void end_frame() override;
+
+        void* get_native_window() const override;
+        void* get_graphics_context() const override;
+        
+        std::string get_glfw_version() const;
+        std::string get_glfw_platform() const;
+        
+        bool init_imgui_backend() override;
+        void shutdown_imgui_backend() override;
+        void imgui_new_frame() override;
+        void imgui_render_draw_data(void* draw_data) override;
+
+    private:
+        GLFWwindow* m_window = nullptr;
+    };
+}
+
+#endif // CLRSYNC_GLFW_OPENGL_HPP
--- a/src/gui/color_scheme_editor.cpp
+++ b/src/gui/color_scheme_editor.cpp
@@ -1,204 +0,0 @@
-#include "color_scheme_editor.hpp"
-#include "imgui.h"
-#include "imgui_helpers.hpp"
-#include "template_editor.hpp"
-#include "settings_window.hpp"
-#include "theme_applier.hpp"
-#include <iostream>
-#include <ranges>
-
-
-color_scheme_editor::color_scheme_editor()
-{
-    const auto &current = m_controller.current_palette();
-
-    if (!current.colors().empty())
-    {
-        theme_applier::apply_to_imgui(current);
-        m_preview.apply_palette(current);
-    }
-    else
-    {
-        std::cout << "WARNING: No palette loaded, skipping theme application\n";
-    }
-}
-
-void color_scheme_editor::notify_palette_changed()
-{
-    if (m_template_editor)
-    {
-        m_template_editor->apply_current_palette(m_controller.current_palette());
-    }
-    if (m_settings_window)
-    {
-        m_settings_window->set_palette(m_controller.current_palette());
-    }
-}
-
-void color_scheme_editor::apply_themes()
-{
-    const auto &current = m_controller.current_palette();
-    theme_applier::apply_to_imgui(current);
-    m_preview.apply_palette(current);
-    notify_palette_changed();
-}
-
-void color_scheme_editor::render_controls_and_colors()
-{
-    ImGui::Begin("Color Schemes");
-
-    render_controls();
-    ImGui::Separator();
-
-    ImGui::BeginChild("ColorTableContent", ImVec2(0, 0), false);
-    m_color_table.render(m_controller.current_palette(), m_controller,
-                         [this]() { apply_themes(); });
-    ImGui::EndChild();
-
-    ImGui::End();
-}
-
-void color_scheme_editor::render_preview()
-{
-    ImGui::Begin("Color Preview");
-
-    m_preview.render(m_controller.current_palette());
-
-    ImGui::End();
-}
-
-void color_scheme_editor::render_controls()
-{
-    const auto &current = m_controller.current_palette();
-    const auto &palettes = m_controller.palettes();
-
-    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(6, 8));
-    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8, 5));
-
-    ImGui::AlignTextToFramePadding();
-    ImGui::Text("Palette:");
-    ImGui::SameLine();
-
-    ImGui::SetNextItemWidth(200.0f);
-    if (ImGui::BeginCombo("##scheme", current.name().c_str()))
-    {
-        for (const auto &name : palettes | std::views::keys)
-        {
-            const bool selected = current.name() == name;
-            if (ImGui::Selectable(name.c_str(), selected))
-            {
-                m_controller.select_palette(name);
-                apply_themes();
-            }
-            if (selected)
-                ImGui::SetItemDefaultFocus();
-        }
-        ImGui::EndCombo();
-    }
-    if (ImGui::IsItemHovered())
-        ImGui::SetTooltip("Select a color palette to edit");
-
-    ImGui::SameLine();
-    ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 8);
-
-    static char new_palette_name_buf[128] = "";
-    if (ImGui::Button(" + New "))
-    {
-        new_palette_name_buf[0] = 0;
-        ImGui::OpenPopup("New Palette");
-    }
-    if (ImGui::IsItemHovered())
-        ImGui::SetTooltip("Create a new palette");
-
-    if (ImGui::BeginPopupModal("New Palette", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
-    {
-        ImGui::Text("Enter a name for the new palette:");
-        ImGui::Spacing();
-
-        ImGui::SetNextItemWidth(250);
-        ImGui::InputTextWithHint("##new_palette_input", "Palette name...", new_palette_name_buf,
-                                 IM_ARRAYSIZE(new_palette_name_buf));
-
-        ImGui::Spacing();
-        ImGui::Separator();
-        ImGui::Spacing();
-
-        bool can_create = strlen(new_palette_name_buf) > 0;
-
-        if (!can_create)
-            ImGui::BeginDisabled();
-
-        if (ImGui::Button("Create", ImVec2(120, 0)))
-        {
-            m_controller.create_palette(new_palette_name_buf);
-            m_controller.select_palette(new_palette_name_buf);
-            apply_themes();
-            new_palette_name_buf[0] = 0;
-            ImGui::CloseCurrentPopup();
-        }
-
-        if (!can_create)
-            ImGui::EndDisabled();
-
-        ImGui::SameLine();
-
-        if (ImGui::Button("Cancel", ImVec2(120, 0)))
-        {
-            new_palette_name_buf[0] = 0;
-            ImGui::CloseCurrentPopup();
-        }
-
-        ImGui::EndPopup();
-    }
-
-    ImGui::SameLine();
-    if (ImGui::Button(" Save "))
-    {
-        m_controller.save_current_palette();
-    }
-    if (ImGui::IsItemHovered())
-        ImGui::SetTooltip("Save current palette to file");
-
-    ImGui::SameLine();
-    auto error = palette_utils::get_color(current, "error");
-    auto error_hover = ImVec4(error.x * 1.1f, error.y * 1.1f, error.z * 1.1f,
-                              error.w);
-    auto error_active = ImVec4(error.x * 0.8f, error.y * 0.8f, error.z * 0.8f,
-                               error.w);
-    auto on_error = palette_utils::get_color(current, "on_error");
-    ImGui::PushStyleColor(ImGuiCol_Button, error);
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, error_hover);
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive, error_active);
-    ImGui::PushStyleColor(ImGuiCol_Text, on_error);
-    if (ImGui::Button(" Delete "))
-    {
-        m_show_delete_confirmation = true;
-    }
-    ImGui::PopStyleColor(4);
-    if (ImGui::IsItemHovered())
-        ImGui::SetTooltip("Delete current palette");
-
-    if (m_show_delete_confirmation)
-    {
-        ImGui::OpenPopup("Delete Palette?");
-        m_show_delete_confirmation = false;
-    }
-
-    palette_utils::render_delete_confirmation_popup("Delete Palette?", current.name(), "palette",
-                                                    current, [this]() {
-                                                        m_controller.delete_current_palette();
-                                                        apply_themes();
-                                                    });
-
-    ImGui::SameLine();
-    ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 16);
-
-    if (ImGui::Button(" Apply Theme "))
-    {
-        m_controller.apply_current_theme();
-    }
-    if (ImGui::IsItemHovered())
-        ImGui::SetTooltip("Apply current palette to all enabled templates");
-
-    ImGui::PopStyleVar(2);
-}
--- a/src/gui/color_scheme_editor.hpp
+++ b/src/gui/color_scheme_editor.hpp
@@ -1,35 +0,0 @@
-#ifndef CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
-#define CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
-
-#include "palette_controller.hpp"
-#include "color_table_renderer.hpp"
-#include "preview_renderer.hpp"
-
-class template_editor;
-class settings_window;
-
-class color_scheme_editor
-{
-public:
-    color_scheme_editor();
-    
-    void render_controls_and_colors();
-    void render_preview();
-    void set_template_editor(template_editor* editor) { m_template_editor = editor; }
-    void set_settings_window(settings_window* window) { m_settings_window = window; }
-    const palette_controller& controller() const { return m_controller; }
-
-private:
-    void render_controls();
-    void apply_themes();
-    void notify_palette_changed();
-
-    palette_controller m_controller;
-    color_table_renderer m_color_table;
-    preview_renderer m_preview;
-    template_editor* m_template_editor{nullptr};
-    settings_window* m_settings_window{nullptr};
-    bool m_show_delete_confirmation{false};
-};
-
-#endif // CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
--- a/src/gui/color_table_renderer.hpp
+++ b/src/gui/color_table_renderer.hpp
@@ -1,30 +0,0 @@
-#ifndef CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
-#define CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
-
-#include "core/palette/palette.hpp"
-#include "palette_controller.hpp"
-#include <functional>
-#include <string>
-
-class color_table_renderer
-{
-public:
-    using OnColorChangedCallback = std::function<void()>;
-    
-    void render(const clrsync::core::palette& palette, 
-                palette_controller& controller,
-                const OnColorChangedCallback& on_changed);
-
-private:
-    void render_color_row(const std::string& name,
-                         const clrsync::core::palette& palette,
-                         palette_controller& controller,
-                         const OnColorChangedCallback& on_changed);
-    
-    bool matches_filter(const std::string& name) const;
-    
-    char m_filter_text[128] = {0};
-    bool m_show_only_modified{false};
-};
-
-#endif // CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
--- a/src/gui/controllers/palette_controller.cpp
+++ b/src/gui/controllers/palette_controller.cpp
@@ -1,4 +1,4 @@
-#include "palette_controller.hpp"
+#include "gui/controllers/palette_controller.hpp"
 #include "core/config/config.hpp"
 #include "core/theme/theme_renderer.hpp"

@@ -13,9 +13,12 @@ palette_controller::palette_controller()

    auto default_theme = clrsync::core::config::instance().default_theme();
    auto it = m_palettes.find(default_theme);
-    if (it != m_palettes.end()) {
+    if (it != m_palettes.end())
+    {
        m_current_palette = it->second;
-    } else {
+    }
+    else
+    {
        m_current_palette = m_palettes.begin()->second;
    }
 }
@@ -23,7 +26,8 @@ palette_controller::palette_controller()
 void palette_controller::select_palette(const std::string &name)
 {
    auto it = m_palettes.find(name);
-    if (it != m_palettes.end()) {
+    if (it != m_palettes.end())
+    {
        m_current_palette = it->second;
    }
 }
--- a/src/gui/controllers/palette_controller.hpp
+++ b/src/gui/controllers/palette_controller.hpp
@@ -6,12 +6,19 @@
 #include <string>
 #include <unordered_map>

-class palette_controller {
+class palette_controller
+{
  public:
    palette_controller();

-    const clrsync::core::palette& current_palette() const { return m_current_palette; }
-    const std::unordered_map<std::string, clrsync::core::palette>& palettes() const { return m_palettes; }
+    const clrsync::core::palette &current_palette() const
+    {
+        return m_current_palette;
+    }
+    const std::unordered_map<std::string, clrsync::core::palette> &palettes() const
+    {
+        return m_palettes;
+    }

    void select_palette(const std::string &name);
    void create_palette(const std::string &name);
--- a/src/gui/controllers/template_controller.cpp
+++ b/src/gui/controllers/template_controller.cpp
@@ -1,4 +1,4 @@
-#include "template_controller.hpp"
+#include "gui/controllers/template_controller.hpp"
 #include "core/config/config.hpp"

 template_controller::template_controller()
@@ -9,7 +9,8 @@ template_controller::template_controller()
 void template_controller::set_template_enabled(const std::string &key, bool enabled)
 {
    auto it = m_templates.find(key);
-    if (it != m_templates.end()) {
+    if (it != m_templates.end())
+    {
        it->second.set_enabled(enabled);
        (void)clrsync::core::config::instance().update_template(key, it->second);
    }
@@ -18,7 +19,8 @@ void template_controller::set_template_enabled(const std::string& key, bool enab
 void template_controller::set_template_input_path(const std::string &key, const std::string &path)
 {
    auto it = m_templates.find(key);
-    if (it != m_templates.end()) {
+    if (it != m_templates.end())
+    {
        it->second.set_template_path(path);
        (void)clrsync::core::config::instance().update_template(key, it->second);
    }
@@ -27,16 +29,19 @@ void template_controller::set_template_input_path(const std::string& key, const
 void template_controller::set_template_output_path(const std::string &key, const std::string &path)
 {
    auto it = m_templates.find(key);
-    if (it != m_templates.end()) {
+    if (it != m_templates.end())
+    {
        it->second.set_output_path(path);
        (void)clrsync::core::config::instance().update_template(key, it->second);
    }
 }

-void template_controller::set_template_reload_command(const std::string& key, const std::string& cmd)
+void template_controller::set_template_reload_command(const std::string &key,
+                                                      const std::string &cmd)
 {
    auto it = m_templates.find(key);
-    if (it != m_templates.end()) {
+    if (it != m_templates.end())
+    {
        it->second.set_reload_command(cmd);
        (void)clrsync::core::config::instance().update_template(key, it->second);
    }
@@ -45,7 +50,8 @@ void template_controller::set_template_reload_command(const std::string& key, co
 bool template_controller::remove_template(const std::string &key)
 {
    auto result = clrsync::core::config::instance().remove_template(key);
-    if (result) {
+    if (result)
+    {
        m_templates.erase(key);
        return true;
    }
--- a/src/gui/controllers/template_controller.hpp
+++ b/src/gui/controllers/template_controller.hpp
@@ -1,16 +1,21 @@
 #ifndef CLRSYNC_GUI_TEMPLATE_CONTROLLER_HPP
 #define CLRSYNC_GUI_TEMPLATE_CONTROLLER_HPP

-#include "core/theme/theme_template.hpp"
-#include "core/theme/template_manager.hpp"
 #include "core/io/toml_file.hpp"
+#include "core/theme/template_manager.hpp"
+#include "core/theme/theme_template.hpp"
 #include <string>
 #include <unordered_map>

-class template_controller {
+class template_controller
+{
  public:
    template_controller();
-    [[nodiscard]] const std::unordered_map<std::string, clrsync::core::theme_template>& templates() const { return m_templates; }
+    [[nodiscard]] const std::unordered_map<std::string, clrsync::core::theme_template> &templates()
+        const
+    {
+        return m_templates;
+    }
    void set_template_enabled(const std::string &key, bool enabled);
    void set_template_input_path(const std::string &key, const std::string &path);
    void set_template_output_path(const std::string &key, const std::string &path);
--- a/src/gui/controllers/theme_applier.cpp
+++ b/src/gui/controllers/theme_applier.cpp
@@ -1,4 +1,4 @@
-#include "theme_applier.hpp"
+#include "gui/controllers/theme_applier.hpp"
 #include "imgui.h"

 namespace theme_applier
@@ -26,27 +26,35 @@ void apply_to_editor(TextEditor& editor, const clrsync::core::palette& current)
    palette[int(TextEditor::PaletteIndex::String)] = get_color_u32(current, "editor_string");
    palette[int(TextEditor::PaletteIndex::CharLiteral)] = get_color_u32(current, "editor_string");
    palette[int(TextEditor::PaletteIndex::Punctuation)] = get_color_u32(current, "editor_main");
-    palette[int(TextEditor::PaletteIndex::Preprocessor)] = get_color_u32(current, "editor_emphasis");
+    palette[int(TextEditor::PaletteIndex::Preprocessor)] =
+        get_color_u32(current, "editor_emphasis");
    palette[int(TextEditor::PaletteIndex::Identifier)] = get_color_u32(current, "editor_main");
    palette[int(TextEditor::PaletteIndex::KnownIdentifier)] = get_color_u32(current, "editor_link");
-    palette[int(TextEditor::PaletteIndex::PreprocIdentifier)] = get_color_u32(current, "editor_link");
+    palette[int(TextEditor::PaletteIndex::PreprocIdentifier)] =
+        get_color_u32(current, "editor_link");

    palette[int(TextEditor::PaletteIndex::Comment)] = get_color_u32(current, "editor_comment");
-    palette[int(TextEditor::PaletteIndex::MultiLineComment)] = get_color_u32(current, "editor_comment");
+    palette[int(TextEditor::PaletteIndex::MultiLineComment)] =
+        get_color_u32(current, "editor_comment");

-    palette[int(TextEditor::PaletteIndex::Background)] = get_color_u32(current, "editor_background");
+    palette[int(TextEditor::PaletteIndex::Background)] =
+        get_color_u32(current, "editor_background");
    palette[int(TextEditor::PaletteIndex::Cursor)] = get_color_u32(current, "cursor");

    palette[int(TextEditor::PaletteIndex::Selection)] = get_color_u32(current, "editor_selected");
    palette[int(TextEditor::PaletteIndex::ErrorMarker)] = get_color_u32(current, "editor_error");
    palette[int(TextEditor::PaletteIndex::Breakpoint)] = get_color_u32(current, "editor_error");

-    palette[int(TextEditor::PaletteIndex::LineNumber)] = get_color_u32(current, "editor_line_number");
+    palette[int(TextEditor::PaletteIndex::LineNumber)] =
+        get_color_u32(current, "editor_line_number");

-    palette[int(TextEditor::PaletteIndex::CurrentLineFill)] = get_color_u32(current, "surface_variant");
-    palette[int(TextEditor::PaletteIndex::CurrentLineFillInactive)] = get_color_u32(current, "surface");
+    palette[int(TextEditor::PaletteIndex::CurrentLineFill)] =
+        get_color_u32(current, "surface_variant");
+    palette[int(TextEditor::PaletteIndex::CurrentLineFillInactive)] =
+        get_color_u32(current, "surface");

-    palette[int(TextEditor::PaletteIndex::CurrentLineEdge)] = get_color_u32(current, "border_focused");
+    palette[int(TextEditor::PaletteIndex::CurrentLineEdge)] =
+        get_color_u32(current, "border_focused");

    editor.SetPalette(palette);
 }
@@ -138,7 +146,8 @@ void apply_to_imgui(const clrsync::core::palette& current)
        ImVec4(border.x * 0.7f, border.y * 0.7f, border.z * 0.7f, border.w);

    style.Colors[ImGuiCol_TableRowBg] = ImVec4(0, 0, 0, 0);
-    style.Colors[ImGuiCol_TableRowBgAlt] = ImVec4(onSurfaceVariant.x, onSurfaceVariant.y, onSurfaceVariant.z, 0.06f);
+    style.Colors[ImGuiCol_TableRowBgAlt] =
+        ImVec4(onSurfaceVariant.x, onSurfaceVariant.y, onSurfaceVariant.z, 0.06f);

    style.Colors[ImGuiCol_Separator] = border;
    style.Colors[ImGuiCol_SeparatorHovered] = accent;
--- a/src/gui/controllers/theme_applier.hpp
+++ b/src/gui/controllers/theme_applier.hpp
@@ -1,13 +1,13 @@
 #ifndef CLRSYNC_GUI_THEME_APPLIER_HPP
 #define CLRSYNC_GUI_THEME_APPLIER_HPP

-#include "core/palette/palette.hpp"
 #include "color_text_edit/TextEditor.h"
+#include "core/palette/palette.hpp"

 namespace theme_applier
 {
 void apply_to_imgui(const clrsync::core::palette &pal);
 void apply_to_editor(TextEditor &editor, const clrsync::core::palette &pal);
-}
+} // namespace theme_applier

 #endif // CLRSYNC_GUI_THEME_APPLIER_HPP
--- a/src/gui/file_browser.cpp
+++ b/src/gui/file_browser.cpp
@@ -1,263 +0,0 @@
-#include "file_browser.hpp"
-#include <filesystem>
-
-#ifdef _WIN32
-#include <windows.h>
-#include <commdlg.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#include <cstring>
-
-namespace file_dialogs {
-
-std::string open_file_dialog(const std::string& title, 
-                             const std::string& initial_path,
-                             const std::vector<std::string>& filters) {
-    OPENFILENAMEA ofn;
-    char file[MAX_PATH] = "";
-    
-    std::string filter_str = "All Files (*.*)\0*.*\0";
-    
-    ZeroMemory(&ofn, sizeof(ofn));
-    ofn.lStructSize = sizeof(ofn);
-    ofn.hwndOwner = GetActiveWindow();
-    ofn.lpstrFile = file;
-    ofn.nMaxFile = sizeof(file);
-    ofn.lpstrFilter = filter_str.c_str();
-    ofn.nFilterIndex = 1;
-    ofn.lpstrTitle = title.c_str();
-    ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
-    
-    if (!initial_path.empty() && std::filesystem::exists(initial_path)) {
-        std::filesystem::path p(initial_path);
-        if (std::filesystem::is_directory(p)) {
-            ofn.lpstrInitialDir = initial_path.c_str();
-        } else {
-            std::string dir = p.parent_path().string();
-            std::string name = p.filename().string();
-            ofn.lpstrInitialDir = dir.c_str();
-            strncpy(file, name.c_str(), sizeof(file) - 1);
-        }
-    }
-    
-    if (GetOpenFileNameA(&ofn)) {
-        return std::string(file);
-    }
-    return "";
-}
-
-std::string save_file_dialog(const std::string& title,
-                             const std::string& initial_path,
-                             const std::vector<std::string>& filters) {
-    OPENFILENAMEA ofn;
-    char file[MAX_PATH] = "";
-    
-    std::string filter_str = "All Files\0*.*\0\0";
-    
-    ZeroMemory(&ofn, sizeof(ofn));
-    ofn.lStructSize = sizeof(ofn);
-    ofn.hwndOwner = GetActiveWindow();
-    ofn.lpstrFile = file;
-    ofn.nMaxFile = sizeof(file);
-    ofn.lpstrFilter = filter_str.c_str();
-    ofn.nFilterIndex = 1;
-    ofn.lpstrTitle = title.c_str();
-    ofn.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_NOCHANGEDIR;
-    
-    if (!initial_path.empty()) {
-        std::filesystem::path p(initial_path);
-        if (std::filesystem::exists(p) && std::filesystem::is_directory(p)) {
-            ofn.lpstrInitialDir = initial_path.c_str();
-        } else {
-            std::string dir = p.parent_path().string();
-            std::string name = p.filename().string();
-            if (std::filesystem::exists(dir)) {
-                ofn.lpstrInitialDir = dir.c_str();
-                strncpy(file, name.c_str(), sizeof(file) - 1);
-            }
-        }
-    }
-    
-    if (GetSaveFileNameA(&ofn)) {
-        return std::string(file);
-    }
-    return "";
-}
-
-std::string select_folder_dialog(const std::string& title,
-                                 const std::string& initial_path) {
-    IFileOpenDialog *pFileOpen;
-    
-    HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_ALL, 
-                                  IID_IFileOpenDialog, reinterpret_cast<void**>(&pFileOpen));
-    
-    if (SUCCEEDED(hr)) {
-        DWORD dwFlags;
-        if (SUCCEEDED(pFileOpen->GetOptions(&dwFlags))) {
-            pFileOpen->SetOptions(dwFlags | FOS_PICKFOLDERS);
-        }
-        
-        std::wstring wtitle(title.begin(), title.end());
-        pFileOpen->SetTitle(wtitle.c_str());
-        
-        if (!initial_path.empty() && std::filesystem::exists(initial_path)) {
-            IShellItem *psi = NULL;
-            std::wstring winitial(initial_path.begin(), initial_path.end());
-            hr = SHCreateItemFromParsingName(winitial.c_str(), NULL, IID_IShellItem, (void**)&psi);
-            if (SUCCEEDED(hr)) {
-                pFileOpen->SetFolder(psi);
-                psi->Release();
-            }
-        }
-        
-        hr = pFileOpen->Show(GetActiveWindow());
-        
-        if (SUCCEEDED(hr)) {
-            IShellItem *pItem;
-            hr = pFileOpen->GetResult(&pItem);
-            if (SUCCEEDED(hr)) {
-                PWSTR pszFilePath;
-                hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &pszFilePath);
-                
-                if (SUCCEEDED(hr)) {
-                    std::wstring wpath(pszFilePath);
-                    std::string result(wpath.begin(), wpath.end());
-                    CoTaskMemFree(pszFilePath);
-                    pItem->Release();
-                    pFileOpen->Release();
-                    return result;
-                }
-                pItem->Release();
-            }
-        }
-        pFileOpen->Release();
-    }
-    
-    return "";
-}
-
-}
-
-#elif !defined(__APPLE__)
-
-#include <gtk/gtk.h>
-
-namespace file_dialogs {
-
-std::string open_file_dialog(const std::string& title, 
-                             const std::string& initial_path,
-                             const std::vector<std::string>& filters) {
-    if (!gtk_init_check(nullptr, nullptr)) {
-        return "";
-    }
-    
-    GtkFileChooserNative *native = gtk_file_chooser_native_new(
-        title.c_str(),
-        nullptr,
-        GTK_FILE_CHOOSER_ACTION_OPEN,
-        "_Open",
-        "_Cancel");
-    
-    GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
-
-    if (!initial_path.empty()) {
-        std::filesystem::path p(initial_path);
-        if (std::filesystem::exists(p)) {
-            if (std::filesystem::is_directory(p)) {
-                gtk_file_chooser_set_current_folder(chooser, initial_path.c_str());
-            } else {
-                gtk_file_chooser_set_current_folder(chooser, p.parent_path().c_str());
-                gtk_file_chooser_set_current_name(chooser, p.filename().c_str());
-            }
-        }
-    }
-    
-    std::string result;
-    if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(native)) == GTK_RESPONSE_ACCEPT) {
-        char* filename = gtk_file_chooser_get_filename(chooser);
-        if (filename) {
-            result = filename;
-            g_free(filename);
-        }
-    }
-    
-    g_object_unref(native);
-    while (gtk_events_pending()) gtk_main_iteration();
-    return result;
-}
-
-std::string save_file_dialog(const std::string& title,
-                             const std::string& initial_path,
-                             const std::vector<std::string>& filters) {
-    if (!gtk_init_check(nullptr, nullptr)) {
-        return "";
-    }
-    
-    GtkFileChooserNative *native = gtk_file_chooser_native_new(
-        title.c_str(),
-        nullptr,
-        GTK_FILE_CHOOSER_ACTION_SAVE,
-        "_Save",
-        "_Cancel");
-    
-    GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
-    gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
-    
-    if (!initial_path.empty()) {
-        std::filesystem::path p(initial_path);
-        if (std::filesystem::exists(p.parent_path())) {
-            gtk_file_chooser_set_current_folder(chooser, p.parent_path().c_str());
-            gtk_file_chooser_set_current_name(chooser, p.filename().c_str());
-        }
-    }
-    
-    std::string result;
-    if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(native)) == GTK_RESPONSE_ACCEPT) {
-        char* filename = gtk_file_chooser_get_filename(chooser);
-        if (filename) {
-            result = filename;
-            g_free(filename);
-        }
-    }
-    
-    g_object_unref(native);
-    while (gtk_events_pending()) gtk_main_iteration();
-    return result;
-}
-
-std::string select_folder_dialog(const std::string& title,
-                                 const std::string& initial_path) {
-    if (!gtk_init_check(nullptr, nullptr)) {
-        return "";
-    }
-    
-    GtkFileChooserNative *native = gtk_file_chooser_native_new(
-        title.c_str(),
-        nullptr,
-        GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-        "_Select",
-        "_Cancel");
-    
-    GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
-
-    if (!initial_path.empty() && std::filesystem::exists(initial_path)) {
-        gtk_file_chooser_set_current_folder(chooser, initial_path.c_str());
-    }
-    
-    std::string result;
-    if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(native)) == GTK_RESPONSE_ACCEPT) {
-        char* filename = gtk_file_chooser_get_filename(chooser);
-        if (filename) {
-            result = filename;
-            g_free(filename);
-        }
-    }
-    
-    g_object_unref(native);
-    while (gtk_events_pending()) gtk_main_iteration();
-    return result;
-}
-
-}
-
-#endif
--- a/src/gui/file_browser.hpp
+++ b/src/gui/file_browser.hpp
@@ -1,20 +0,0 @@
-#ifndef CLRSYNC_GUI_FILE_BROWSER_HPP
-#define CLRSYNC_GUI_FILE_BROWSER_HPP
-
-#include <string>
-#include <vector>
-
-namespace file_dialogs {
-    std::string open_file_dialog(const std::string& title = "Open File", 
-                                  const std::string& initial_path = "",
-                                  const std::vector<std::string>& filters = {});
-    
-    std::string save_file_dialog(const std::string& title = "Save File",
-                                  const std::string& initial_path = "",
-                                  const std::vector<std::string>& filters = {});
-    
-    std::string select_folder_dialog(const std::string& title = "Select Folder",
-                                      const std::string& initial_path = "");
-}
-
-#endif // CLRSYNC_GUI_FILE_BROWSER_HPP
--- a/src/gui/font_loader.cpp
+++ b/src/gui/font_loader.cpp
@@ -1,333 +0,0 @@
-#include "font_loader.hpp"
-#include "core/config/config.hpp"
-#include "imgui_internal.h"
-#include <imgui.h>
-#include <algorithm>
-
-#if defined(_WIN32)
-
-#include <algorithm>
-#include <windows.h>
-#include <winreg.h>
-
-static std::string search_registry_for_font(HKEY root_key, const char* subkey, const std::string& font_name_lower, const char* default_font_dir)
-{
-    HKEY hKey;
-    LONG result = RegOpenKeyExA(root_key, subkey, 0, KEY_READ, &hKey);
-
-    if (result != ERROR_SUCCESS)
-        return {};
-
-    char value_name[512];
-    BYTE value_data[512];
-    DWORD value_name_size, value_data_size, type;
-    DWORD index = 0;
-
-    std::string found_path;
-
-    while (true)
-    {
-        value_name_size = sizeof(value_name);
-        value_data_size = sizeof(value_data);
-
-        result = RegEnumValueA(hKey, index++, value_name, &value_name_size, nullptr, &type, value_data, &value_data_size);
-
-        if (result != ERROR_SUCCESS)
-            break;
-
-        if (type != REG_SZ)
-            continue;
-
-        std::string reg_font_name = value_name;
-        std::transform(reg_font_name.begin(), reg_font_name.end(), reg_font_name.begin(), ::tolower);
-
-        std::string reg_font_name_clean = reg_font_name;
-        size_t type_pos = reg_font_name_clean.find(" (");
-        if (type_pos != std::string::npos)
-            reg_font_name_clean = reg_font_name_clean.substr(0, type_pos);
-
-        if (reg_font_name_clean == font_name_lower)
-        {
-            std::string font_file = reinterpret_cast<char*>(value_data);
-
-            // If path is not absolute, prepend default font directory
-            if (font_file.find(":\\") == std::string::npos)
-            {
-                found_path = std::string(default_font_dir) + "\\" + font_file;
-            }
-            else
-            {
-                found_path = font_file;
-            }
-            break;
-        }
-    }
-
-    RegCloseKey(hKey);
-    return found_path;
-}
-
-std::string font_loader::find_font_windows(const char* font_name)
-{
-    std::string font_name_lower = font_name;
-    std::transform(font_name_lower.begin(), font_name_lower.end(), font_name_lower.begin(), ::tolower);
-
-    char windows_dir[MAX_PATH];
-    GetWindowsDirectoryA(windows_dir, MAX_PATH);
-    std::string system_fonts_dir = std::string(windows_dir) + "\\Fonts";
-
-    // First, try system-wide fonts (HKEY_LOCAL_MACHINE)
-    std::string path = search_registry_for_font(
-        HKEY_LOCAL_MACHINE,
-        "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
-        font_name_lower,
-        system_fonts_dir.c_str()
-    );
-
-    if (!path.empty())
-        return path;
-
-    // If not found, try per-user fonts (HKEY_CURRENT_USER)
-    char local_appdata[MAX_PATH];
-    if (GetEnvironmentVariableA("LOCALAPPDATA", local_appdata, MAX_PATH) > 0)
-    {
-        std::string user_fonts_dir = std::string(local_appdata) + "\\Microsoft\\Windows\\Fonts";
-
-        path = search_registry_for_font(
-            HKEY_CURRENT_USER,
-            "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
-            font_name_lower,
-            user_fonts_dir.c_str()
-        );
-    }
-
-    return path;
-}
-#endif
-
-#if defined(__APPLE__)
-
-#include <CoreText/CoreText.h>
-
-std::vector<unsigned char> font_loader::load_font_macos(const char* font_name)
-{
-    std::vector<unsigned char> out;
-
-    CFStringRef cf_name = CFStringCreateWithCString(nullptr, font_name, kCFStringEncodingUTF8);
-    if (!cf_name)
-        return out;
-
-    CTFontDescriptorRef desc = CTFontDescriptorCreateWithNameAndSize(cf_name, 12);
-    CFRelease(cf_name);
-
-    if (!desc)
-        return out;
-
-    CFURLRef url = (CFURLRef)CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute);
-    CFRelease(desc);
-
-    if (!url)
-        return out;
-
-    CFDataRef data = nullptr;
-    Boolean success = CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, url, &data, nullptr, nullptr, nullptr);
-    CFRelease(url);
-
-    if (success && data)
-    {
-        CFIndex size = CFDataGetLength(data);
-        if (size > 100)
-        {
-            out.resize(size);
-            CFDataGetBytes(data, CFRangeMake(0, size), out.data());
-        }
-        CFRelease(data);
-    }
-
-    return out;
-}
-
-#endif
-
-#if !defined(_WIN32) && !defined(__APPLE__)
-
-#include <fontconfig/fontconfig.h>
-
-std::string font_loader::find_font_linux(const char* font_name)
-{
-    FcInit();
-
-    FcPattern* pattern = FcNameParse(reinterpret_cast<const FcChar8*>(font_name));
-    if (!pattern)
-        return {};
-
-    FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
-    FcDefaultSubstitute(pattern);
-
-    FcResult result;
-    FcPattern* match = FcFontMatch(nullptr, pattern, &result);
-
-    std::string out;
-
-    if (match)
-    {
-        FcChar8* file = nullptr;
-        if (FcPatternGetString(match, FC_FILE, 0, &file) == FcResultMatch)
-            out = reinterpret_cast<const char*>(file);
-
-        FcPatternDestroy(match);
-    }
-
-    FcPatternDestroy(pattern);
-    return out;
-}
-
-#endif
-
-std::string font_loader::find_font_path(const char* font_name)
-{
-#if defined(_WIN32)
-    return find_font_windows(font_name);
-
-#elif defined(__APPLE__)
-    (void)font_name;
-    return {};
-
-#else
-    return find_font_linux(font_name);
-
-#endif
-}
-
-ImFont* font_loader::load_font(const char* font_name, float size_px)
-{
-#if defined(__APPLE__)
-    std::vector<unsigned char> buf = load_font_macos(font_name);
-    if (buf.empty())
-        return nullptr;
-
-    return ImGui::GetIO().Fonts->AddFontFromMemoryTTF(
-        buf.data(),
-        static_cast<int>(buf.size()),
-        size_px
-    );
-
-#else
-    std::string path = find_font_path(font_name);
-    if (path.empty())
-        return nullptr;
-
-    float scale = ImGui::GetIO().DisplayFramebufferScale.y;
-    return ImGui::GetIO().Fonts->AddFontFromFileTTF(
-        path.c_str(),
-        size_px * scale
-    );
-#endif
-}
-
-void font_loader::push_default_font()
-{
-    ImGui::PushFont(ImGui::GetDefaultFont(), clrsync::core::config::instance().font_size());
-}
-void font_loader::pop_font()
-{
-    ImGui::PopFont();
-}
-
-std::vector<std::string> font_loader::get_system_fonts()
-{
-    std::vector<std::string> fonts;
-
-#if defined(_WIN32)
-    auto enumerate_registry_fonts = [&fonts](HKEY root_key, const char* subkey)
-    {
-        HKEY hKey;
-        if (RegOpenKeyExA(root_key, subkey, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
-            return;
-
-        char value_name[512];
-        DWORD value_name_size;
-        DWORD index = 0;
-
-        while (true)
-        {
-            value_name_size = sizeof(value_name);
-            LONG result = RegEnumValueA(hKey, index++, value_name, &value_name_size, nullptr, nullptr, nullptr, nullptr);
-            
-            if (result != ERROR_SUCCESS)
-                break;
-
-            std::string font_name = value_name;
-            size_t pos = font_name.find(" (");
-            if (pos != std::string::npos)
-                font_name = font_name.substr(0, pos);
-            
-            if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
-                fonts.push_back(font_name);
-        }
-
-        RegCloseKey(hKey);
-    };
-
-    enumerate_registry_fonts(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts");
-    enumerate_registry_fonts(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts");
-
-#elif defined(__APPLE__)
-    CTFontCollectionRef collection = CTFontCollectionCreateFromAvailableFonts(nullptr);
-    if (collection)
-    {
-        CFArrayRef fontDescriptors = CTFontCollectionCreateMatchingFontDescriptors(collection);
-        CFRelease(collection);
-        
-        if (fontDescriptors)
-        {
-            CFIndex count = CFArrayGetCount(fontDescriptors);
-            for (CFIndex i = 0; i < count; i++)
-            {
-                CTFontDescriptorRef descriptor = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fontDescriptors, i);
-                CFStringRef fontName = (CFStringRef)CTFontDescriptorCopyAttribute(descriptor, kCTFontDisplayNameAttribute);
-                
-                if (fontName)
-                {
-                    char buffer[256];
-                    if (CFStringGetCString(fontName, buffer, sizeof(buffer), kCFStringEncodingUTF8))
-                    {
-                        std::string font_name = buffer;
-                        if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
-                            fonts.push_back(font_name);
-                    }
-                    CFRelease(fontName);
-                }
-            }
-            CFRelease(fontDescriptors);
-        }
-    }
-
-#else
-    FcInit();
-    FcPattern* pattern = FcPatternCreate();
-    FcObjectSet* os = FcObjectSetBuild(FC_FAMILY, nullptr);
-    FcFontSet* fs = FcFontList(nullptr, pattern, os);
-    
-    if (fs)
-    {
-        for (int i = 0; i < fs->nfont; i++)
-        {
-            FcChar8* family = nullptr;
-            if (FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch)
-            {
-                std::string font_name = reinterpret_cast<const char*>(family);
-                if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
-                    fonts.push_back(font_name);
-            }
-        }
-        FcFontSetDestroy(fs);
-    }
-    
-    FcObjectSetDestroy(os);
-    FcPatternDestroy(pattern);
-#endif
-
-    std::sort(fonts.begin(), fonts.end());
-    return fonts;
-}
--- a/src/gui/imgui_helpers.cpp
+++ b/src/gui/imgui_helpers.cpp
@@ -1,266 +0,0 @@
-#include <iostream>
-#include <string>
-
-#include "GLFW/glfw3.h"
-#include "gui/settings_window.hpp"
-#include "imgui_impl_glfw.h"
-#include "imgui_impl_opengl3.h"
-
-#include "imgui_helpers.hpp"
-
-#include "imgui_internal.h"
-
-GLFWwindow * init_glfw()
-{
-    glfwSetErrorCallback([](int error, const char* description) {
-        std::cerr << "GLFW Error " << error << ": " << description << std::endl;
-    });
-    
-    if (!glfwInit())
-    {
-        std::cerr << "Failed to initialize GLFW\n";
-        return nullptr;
-    }
-
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-    #ifdef __APPLE__
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
-    #else
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
-    #endif
-    glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
-
-    GLFWwindow* w = glfwCreateWindow(1280, 720, "clrsync", nullptr, nullptr);
-    if (!w)
-    {
-        std::cerr << "Failed to create GLFW window\n";
-        return nullptr;
-    }
-
-    glfwMakeContextCurrent(w);
-    glfwSwapInterval(1);
-    return w;
-}
-
-void init_imgui(GLFWwindow* window, const std::string& ini_path)
-{
-    IMGUI_CHECKVERSION();
-    ImGui::CreateContext();
-
-    ImGuiIO& io = ImGui::GetIO();
-    io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
-    io.IniFilename = ini_path.c_str();
-
-    ImGui::StyleColorsDark();
-    ImGui_ImplGlfw_InitForOpenGL(window, true);
-    #ifdef __APPLE__
-    ImGui_ImplOpenGL3_Init("#version 150");
-    #else
-    ImGui_ImplOpenGL3_Init("#version 120");
-    #endif
-}
-
-void begin_frame()
-{
-    ImGui_ImplOpenGL3_NewFrame();
-    ImGui_ImplGlfw_NewFrame();
-    ImGui::NewFrame();
-}
-
-void render_menu_bar(about_window* about, settings_window* settings)
-{
-    if (ImGui::BeginMainMenuBar())
-    {
-        if (ImGui::BeginMenu("File"))
-        {
-            if (ImGui::MenuItem("Settings"))
-            {
-                if (settings)
-                    settings->show();
-            }
-            ImGui::Separator();
-            if (ImGui::MenuItem("Exit"))
-            {
-                glfwSetWindowShouldClose(glfwGetCurrentContext(), GLFW_TRUE);
-            }
-            ImGui::EndMenu();
-        }
-
-        if (ImGui::BeginMenu("Help"))
-        {
-            if (ImGui::MenuItem("About"))
-            {
-                if (about)
-                    about->show();
-            }
-            ImGui::EndMenu();
-        }
-        ImGui::EndMainMenuBar();
-    }
-}
-
-void setup_main_dockspace(bool& first_time)
-{
-    const ImGuiViewport* viewport = ImGui::GetMainViewport();
-    ImGui::SetNextWindowPos(viewport->Pos);
-    ImGui::SetNextWindowSize(viewport->Size);
-    ImGui::SetNextWindowViewport(viewport->ID);
-
-    constexpr ImGuiWindowFlags flags =
-        ImGuiWindowFlags_NoTitleBar |
-        ImGuiWindowFlags_NoCollapse |
-        ImGuiWindowFlags_NoResize |
-        ImGuiWindowFlags_NoMove |
-        ImGuiWindowFlags_NoBringToFrontOnFocus |
-        ImGuiWindowFlags_NoNavFocus |
-        ImGuiWindowFlags_MenuBar;
-
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0,0));
-    ImGui::Begin("MainDockSpace", nullptr, flags);
-    ImGui::PopStyleVar(3);
-
-    ImGuiID dockspace_id = ImGui::GetID("MainDockSpace");
-
-    if (first_time)
-    {
-        first_time = false;
-
-        ImGui::DockBuilderRemoveNode(dockspace_id);
-        ImGui::DockBuilderAddNode(dockspace_id, ImGuiDockNodeFlags_DockSpace);
-        ImGui::DockBuilderSetNodeSize(dockspace_id, viewport->Size);
-
-        ImGuiID center, right;
-        ImGui::DockBuilderSplitNode(dockspace_id, ImGuiDir_Right, 0.5f, &right, &center);
-
-        ImGuiDockNode* center_node = ImGui::DockBuilderGetNode(center);
-        if (center_node)
-        {
-            center_node->LocalFlags |= ImGuiDockNodeFlags_CentralNode;
-        }
-
-        ImGui::DockBuilderDockWindow("Color Schemes", right);
-        ImGui::DockBuilderDockWindow("Color Preview", center);
-        ImGui::DockBuilderDockWindow("Templates", center);
-        
-        ImGui::DockBuilderFinish(dockspace_id);
-    }
-
-    ImGui::DockSpace(dockspace_id, ImVec2{0,0}, ImGuiDockNodeFlags_None);
-    ImGui::End();
-}
-
-void end_frame(GLFWwindow* window)
-{
-    ImGui::Render();
-    int w, h;
-    glfwGetFramebufferSize(window, &w, &h);
-    glViewport(0, 0, w, h);
-    glClearColor(0.1f, 0.1f, 0.1f, 0.f);
-    glClear(GL_COLOR_BUFFER_BIT);
-    ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
-
-    glfwSwapBuffers(window);
-}
-
-void shutdown(GLFWwindow* window)
-{
-    ImGui_ImplOpenGL3_Shutdown();
-    ImGui_ImplGlfw_Shutdown();
-    ImGui::DestroyContext();
-    glfwDestroyWindow(window);
-    glfwTerminate();
-}
-
-namespace palette_utils 
-{
-
-ImVec4 get_color(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback)
-{
-    auto colors = pal.colors();
-    if (colors.empty())
-        return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
-    
-    auto it = colors.find(key);
-    if (it == colors.end() && !fallback.empty())
-    {
-        it = colors.find(fallback);
-    }
-    
-    if (it != colors.end())
-    {
-        const auto& col = it->second;
-        const uint32_t hex = col.hex();
-        const float r = ((hex >> 24) & 0xFF) / 255.0f;
-        const float g = ((hex >> 16) & 0xFF) / 255.0f;
-        const float b = ((hex >> 8) & 0xFF) / 255.0f;
-        const float a = (hex & 0xFF) / 255.0f;
-        return ImVec4(r, g, b, a);
-    }
-    return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
-}
-
-uint32_t get_color_u32(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback)
-{
-    auto colors = pal.colors();
-    if (colors.empty())
-        return 0xFFFFFFFF;
-    
-    auto it = colors.find(key);
-    if (it == colors.end() && !fallback.empty())
-    {
-        it = colors.find(fallback);
-    }
-    
-    if (it != colors.end())
-    {
-        const auto& col = it->second;
-        const uint32_t hex = col.hex();
-        const uint32_t r = (hex >> 24) & 0xFF;
-        const uint32_t g = (hex >> 16) & 0xFF;
-        const uint32_t b = (hex >> 8) & 0xFF;
-        const uint32_t a = hex & 0xFF;
-        return (a << 24) | (b << 16) | (g << 8) | r;
-    }
-    return 0xFFFFFFFF;
-}
-
-bool render_delete_confirmation_popup(const std::string& popup_title, const std::string& item_name, 
-                                      const std::string& item_type, const clrsync::core::palette& pal,
-                                      const std::function<void()>& on_delete)
-{
-    bool result = false;
-    if (ImGui::BeginPopupModal(popup_title.c_str(), nullptr, ImGuiWindowFlags_AlwaysAutoResize))
-    {
-        ImVec4 warning_color = get_color(pal, "warning", "accent");
-        ImGui::TextColored(warning_color, "Are you sure you want to delete '%s'?", item_name.c_str());
-        ImGui::Text("This action cannot be undone.");
-        
-        ImGui::Spacing();
-        ImGui::Separator();
-        ImGui::Spacing();
-        
-        float button_width = 120.0f;
-        float total_width = 2.0f * button_width + ImGui::GetStyle().ItemSpacing.x;
-        float window_width = ImGui::GetContentRegionAvail().x;
-        ImGui::SetCursorPosX((window_width - total_width) * 0.5f);
-
-        if (ImGui::Button("Delete", ImVec2(button_width, 0)))
-        {
-            on_delete();
-            result = true;
-            ImGui::CloseCurrentPopup();
-        }
-        
-        ImGui::SameLine();
-        if (ImGui::Button("Cancel", ImVec2(button_width, 0)))
-        {
-            ImGui::CloseCurrentPopup();
-        }
-        ImGui::EndPopup();
-    }
-    return result;
-}
-
-}
--- a/src/gui/imgui_helpers.hpp
+++ b/src/gui/imgui_helpers.hpp
@@ -1,37 +0,0 @@
-#ifndef CLRSYNC_IMGUI_HELPERS_HPP
-#define CLRSYNC_IMGUI_HELPERS_HPP
-
-#include "gui/about_window.hpp"
-#include "core/palette/palette.hpp"
-#include "imgui.h"
-#include <functional>
-#include <string>
-
-struct GLFWwindow;
-class settings_window;
-
-GLFWwindow * init_glfw();
-void init_imgui(GLFWwindow* window, const std::string& ini_path);
-void begin_frame();
-void setup_main_dockspace(bool& first_time);
-void end_frame(GLFWwindow* window);
-void shutdown(GLFWwindow* window);
-void render_menu_bar(about_window* about, settings_window* settings);
-
-namespace palette_utils 
-{
-    ImVec4 get_color(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback = "");
-    uint32_t get_color_u32(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback = "");
-    bool render_delete_confirmation_popup(const std::string& popup_title, const std::string& item_name, 
-                                          const std::string& item_type, const clrsync::core::palette& pal,
-                                          const std::function<void()>& on_delete);
-}
-
-namespace imgui_helpers 
-{
-    inline ImVec4 get_palette_color(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback = "") {
-        return palette_utils::get_color(pal, key, fallback);
-    }
-}
-
-#endif // CLRSYNC_IMGUI_HELPERS_HPP
--- a/src/gui/layout/main_layout.cpp
+++ b/src/gui/layout/main_layout.cpp
@@ -0,0 +1,117 @@
+#include "main_layout.hpp"
+#include "imgui.h"
+#include "imgui_internal.h"
+
+namespace clrsync::gui::layout
+{
+
+void main_layout::render_menu_bar()
+{
+    ImGuiViewport *vp = ImGui::GetMainViewport();
+
+    const float bar_height = 30.0f;
+
+    ImGui::SetNextWindowPos(vp->Pos);
+    ImGui::SetNextWindowSize(ImVec2(vp->Size.x, bar_height));
+    ImGui::SetNextWindowViewport(vp->ID);
+
+    ImGuiWindowFlags flags = ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoTitleBar |
+                             ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove |
+                             ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings;
+
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(8, 2));
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8, 3));
+
+    ImGui::Begin("##TopBar", nullptr, flags);
+
+    ImGuiStyle &style = ImGui::GetStyle();
+    style.FrameBorderSize = 1.0f;
+
+    const char *settings_label = "Settings";
+    const char *about_label = "About";
+
+    ImVec2 settings_size = ImGui::CalcTextSize(settings_label);
+    ImVec2 about_size = ImGui::CalcTextSize(about_label);
+
+    float total_width = settings_size.x + style.FramePadding.x * 2.0f + about_size.x +
+                        style.FramePadding.x * 2.0f + style.ItemSpacing.x;
+
+    float pos_x = ImGui::GetWindowWidth() - total_width - style.WindowPadding.x;
+
+    float button_height = ImGui::GetFrameHeight();
+    float window_height = ImGui::GetWindowHeight();
+    float center_y = (window_height - button_height) * 0.5f;
+
+    ImGui::SetCursorPos(ImVec2(pos_x, center_y));
+
+    if (ImGui::Button(settings_label))
+    {
+        m_show_settings = true;
+    }
+
+    ImGui::SameLine();
+    ImGui::SetCursorPosY(center_y);
+
+    if (ImGui::Button(about_label))
+    {
+        m_show_about = true;
+    }
+
+    ImGui::End();
+
+    ImGui::PopStyleVar(4);
+}
+
+void main_layout::setup_dockspace(bool &first_time)
+{
+    const ImGuiViewport *viewport = ImGui::GetMainViewport();
+    const float topbar_height = 32.0f;
+    ImGui::SetNextWindowPos(ImVec2(viewport->Pos.x, viewport->Pos.y + topbar_height));
+    ImGui::SetNextWindowSize(ImVec2(viewport->Size.x, viewport->Size.y - topbar_height));
+    ImGui::SetNextWindowViewport(viewport->ID);
+
+    constexpr ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse |
+                                       ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove |
+                                       ImGuiWindowFlags_NoBringToFrontOnFocus |
+                                       ImGuiWindowFlags_NoNavFocus;
+
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8, 3));
+    ImGui::Begin("MainDockSpace", nullptr, flags);
+    ImGui::PopStyleVar(4);
+
+    ImGuiID dockspace_id = ImGui::GetID("MainDockSpace");
+
+    if (first_time)
+    {
+        first_time = false;
+
+        ImGui::DockBuilderRemoveNode(dockspace_id);
+        ImGui::DockBuilderAddNode(dockspace_id, ImGuiDockNodeFlags_DockSpace);
+        ImGui::DockBuilderSetNodeSize(dockspace_id, viewport->Size);
+
+        ImGuiID center, right;
+        ImGui::DockBuilderSplitNode(dockspace_id, ImGuiDir_Right, 0.5f, &right, &center);
+
+        ImGuiDockNode *center_node = ImGui::DockBuilderGetNode(center);
+        if (center_node)
+        {
+            center_node->LocalFlags |= ImGuiDockNodeFlags_CentralNode;
+        }
+
+        ImGui::DockBuilderDockWindow("Color Schemes", right);
+        ImGui::DockBuilderDockWindow("Color Preview", center);
+        ImGui::DockBuilderDockWindow("Templates", center);
+
+        ImGui::DockBuilderFinish(dockspace_id);
+    }
+
+    ImGui::DockSpace(dockspace_id, ImVec2{0, 0}, ImGuiDockNodeFlags_None);
+    ImGui::End();
+}
+
+} // namespace clrsync::gui::layout
--- a/src/gui/layout/main_layout.hpp
+++ b/src/gui/layout/main_layout.hpp
@@ -0,0 +1,28 @@
+#ifndef CLRSYNC_GUI_LAYOUT_MAIN_LAYOUT_HPP
+#define CLRSYNC_GUI_LAYOUT_MAIN_LAYOUT_HPP
+
+namespace clrsync::gui::layout
+{
+
+class main_layout
+{
+  public:
+    void setup_dockspace(bool &first_time);
+    void render_menu_bar();
+
+    bool should_show_about() const { return m_show_about; }
+    bool should_show_settings() const { return m_show_settings; }
+    void clear_actions()
+    {
+        m_show_about = false;
+        m_show_settings = false;
+    }
+
+  private:
+    bool m_show_about = false;
+    bool m_show_settings = false;
+};
+
+} // namespace clrsync::gui::layout
+
+#endif // CLRSYNC_GUI_LAYOUT_MAIN_LAYOUT_HPP
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -1,21 +1,18 @@
+#include <iostream>
 #include <memory>

-#include <GLFW/glfw3.h>
-#include <GLFW/glfw3native.h>
-
-
+#include "core/common/error.hpp"
+#include "core/common/utils.hpp"
 #include "core/config/config.hpp"
 #include "core/io/toml_file.hpp"
-#include "core/utils.hpp"
-#include "core/error.hpp"
-
-#include "color_scheme_editor.hpp"
-#include "gui/font_loader.hpp"
-#include "gui/settings_window.hpp"
-#include "imgui_helpers.hpp"
-#include "template_editor.hpp"
-#include "about_window.hpp"

+#include "gui/backend/glfw_opengl.hpp"
+#include "gui/layout/main_layout.hpp"
+#include "gui/ui_manager.hpp"
+#include "gui/views/about_window.hpp"
+#include "gui/views/color_scheme_editor.hpp"
+#include "gui/views/settings_window.hpp"
+#include "gui/views/template_editor.hpp"

 int main(int, char **)
 {
@@ -26,7 +23,9 @@ int main(int, char**)
    if (!init_result)
    {
        std::cerr << "Fatal error: " << init_result.error().description() << std::endl;
-        std::cerr << "Hint: Set CLRSYNC_CONFIG_PATH environment variable or ensure config exists at: " << config_path << std::endl;
+        std::cerr
+            << "Hint: Set CLRSYNC_CONFIG_PATH environment variable or ensure config exists at: "
+            << config_path << std::endl;
        return 1;
    }

@@ -34,58 +33,76 @@ int main(int, char**)
    static std::string ini_path = (base.parent_path() / "layout.ini").string();
    bool first_time = !std::filesystem::exists(ini_path);

-    GLFWwindow* window = init_glfw();
-    if (!window) return 1;
+    auto backend = clrsync::gui::backend::glfw_opengl_backend();
+    auto window_config = clrsync::gui::backend::window_config();
+    window_config.title = "clrsync";
+    window_config.width = 1280;
+    window_config.height = 720;
+    window_config.decorated = true;
+    window_config.transparent_framebuffer = true;

-    printf("GLFV Version: %s\n", glfwGetVersionString());
-
-    std::cout << "GLFW runtime platform: ";
-    switch (glfwGetPlatform()) {
-        case GLFW_PLATFORM_WAYLAND: std::cout << "Wayland\n"; break;
-        case GLFW_PLATFORM_X11: std::cout << "X11\n"; break;
-        case GLFW_PLATFORM_COCOA: std::cout << "Cocoa\n"; break;
-        case GLFW_PLATFORM_WIN32: std::cout << "Win32\n"; break;
-        default: std::cout << "Unknown\n";
+    if (!backend.initialize(window_config))
+    {
+        std::cerr << "Failed to initialize backend." << std::endl;
+        return 1;
    }

+    std::cout << "GLFW Version: " << backend.get_glfw_version() << std::endl;
+    std::cout << "GLFW runtime platform: " << backend.get_glfw_platform() << std::endl;

-    init_imgui(window, ini_path);
+    clrsync::gui::ui_manager ui_manager(&backend);
    
-    font_loader loader;
+    clrsync::gui::ui_config ui_cfg;
+    ui_cfg.ini_path = ini_path;
+    ui_cfg.enable_docking = true;
+    ui_cfg.enable_keyboard_nav = true;
    
-    ImFont* font =
-        loader.load_font(clrsync::core::config::instance().font().c_str(), clrsync::core::config::instance().font_size());
-
-    if (font)
-        ImGui::GetIO().FontDefault = font;
+    if (!ui_manager.initialize(ui_cfg))
+    {
+        std::cerr << "Failed to initialize UI manager." << std::endl;
+        return 1;
+    }

+    clrsync::gui::layout::main_layout main_layout;
    color_scheme_editor colorEditor;
-    template_editor templateEditor;
+    template_editor templateEditor(&ui_manager);
    about_window aboutWindow;
-    settings_window settingsWindow;
+    settings_window settingsWindow(&ui_manager);

    colorEditor.set_template_editor(&templateEditor);
    colorEditor.set_settings_window(&settingsWindow);
    templateEditor.apply_current_palette(colorEditor.controller().current_palette());
    settingsWindow.set_palette(colorEditor.controller().current_palette());

-    while (!glfwWindowShouldClose(window))
+    while (!backend.should_close())
    {
-        glfwPollEvents();
-        loader.push_default_font();
-        begin_frame();
+        backend.begin_frame();
+        
+        ui_manager.push_default_font();
+        ui_manager.begin_frame();
+
+        main_layout.render_menu_bar();
+        main_layout.setup_dockspace(first_time);
+
+        if (main_layout.should_show_about())
+            aboutWindow.show();
+        if (main_layout.should_show_settings())
+            settingsWindow.show();
+        main_layout.clear_actions();

-        render_menu_bar(&aboutWindow, &settingsWindow);
-        setup_main_dockspace(first_time); 
        templateEditor.render();
        colorEditor.render_controls_and_colors();
        colorEditor.render_preview();
        aboutWindow.render(colorEditor.controller().current_palette());
        settingsWindow.render();

-        loader.pop_font();
-        end_frame(window);
+        ui_manager.pop_font();
+        
+        ui_manager.end_frame();
+        backend.end_frame();
    }
-    shutdown(window);
+
+    ui_manager.shutdown();
+    backend.shutdown();
    return 0;
 }
--- a/src/gui/platform/file_browser.hpp
+++ b/src/gui/platform/file_browser.hpp
@@ -0,0 +1,21 @@
+#ifndef CLRSYNC_GUI_FILE_BROWSER_HPP
+#define CLRSYNC_GUI_FILE_BROWSER_HPP
+
+#include <string>
+#include <vector>
+
+namespace file_dialogs
+{
+std::string open_file_dialog(const std::string &title = "Open File",
+                             const std::string &initial_path = "",
+                             const std::vector<std::string> &filters = {});
+
+std::string save_file_dialog(const std::string &title = "Save File",
+                             const std::string &initial_path = "",
+                             const std::vector<std::string> &filters = {});
+
+std::string select_folder_dialog(const std::string &title = "Select Folder",
+                                 const std::string &initial_path = "");
+} // namespace file_dialogs
+
+#endif // CLRSYNC_GUI_FILE_BROWSER_HPP
--- a/src/gui/platform/font_loader.hpp
+++ b/src/gui/platform/font_loader.hpp
@@ -1,9 +1,9 @@
 #ifndef CLRSYNC_GUI_SYSTEM_FONT_LOADER_HPP
 #define CLRSYNC_GUI_SYSTEM_FONT_LOADER_HPP

+#include <imgui.h>
 #include <string>
 #include <vector>
-#include <imgui.h>

 class font_loader
 {
--- a/src/gui/platform/linux/file_browser_linux.cpp
+++ b/src/gui/platform/linux/file_browser_linux.cpp
@@ -0,0 +1,161 @@
+#ifdef __linux__
+
+#include "gui/platform/file_browser.hpp"
+#include <gtk/gtk.h>
+#include <filesystem>
+#include <GLFW/glfw3.h>
+
+namespace file_dialogs
+{
+
+std::string open_file_dialog(const std::string &title, const std::string &initial_path,
+                             const std::vector<std::string> &filters)
+{
+    if (!gtk_init_check(nullptr, nullptr))
+    {
+        return "";
+    }
+
+    GtkFileChooserNative *native = gtk_file_chooser_native_new(
+        title.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_OPEN, "_Open", "_Cancel");
+
+    GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
+
+    if (!initial_path.empty())
+    {
+        std::filesystem::path p(initial_path);
+        if (std::filesystem::exists(p))
+        {
+            if (std::filesystem::is_directory(p))
+            {
+                gtk_file_chooser_set_current_folder(chooser, initial_path.c_str());
+            }
+            else
+            {
+                gtk_file_chooser_set_current_folder(chooser, p.parent_path().c_str());
+                gtk_file_chooser_set_current_name(chooser, p.filename().c_str());
+            }
+        }
+    }
+
+    std::string result;
+    
+    gint response = gtk_native_dialog_run(GTK_NATIVE_DIALOG(native));
+    
+    while (gtk_events_pending())
+    {
+        gtk_main_iteration();
+        glfwPollEvents();
+    }
+    
+    if (response == GTK_RESPONSE_ACCEPT)
+    {
+        char *filename = gtk_file_chooser_get_filename(chooser);
+        if (filename)
+        {
+            result = filename;
+            g_free(filename);
+        }
+    }
+
+    g_object_unref(native);
+    while (gtk_events_pending())
+        gtk_main_iteration();
+    return result;
+}
+
+std::string save_file_dialog(const std::string &title, const std::string &initial_path,
+                             const std::vector<std::string> &filters)
+{
+    if (!gtk_init_check(nullptr, nullptr))
+    {
+        return "";
+    }
+
+    GtkFileChooserNative *native = gtk_file_chooser_native_new(
+        title.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_SAVE, "_Save", "_Cancel");
+
+    GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
+    gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
+
+    if (!initial_path.empty())
+    {
+        std::filesystem::path p(initial_path);
+        if (std::filesystem::exists(p.parent_path()))
+        {
+            gtk_file_chooser_set_current_folder(chooser, p.parent_path().c_str());
+            gtk_file_chooser_set_current_name(chooser, p.filename().c_str());
+        }
+    }
+
+    std::string result;
+    
+    gint response = gtk_native_dialog_run(GTK_NATIVE_DIALOG(native));
+    
+    while (gtk_events_pending())
+    {
+        gtk_main_iteration();
+        glfwPollEvents();
+    }
+    
+    if (response == GTK_RESPONSE_ACCEPT)
+    {
+        char *filename = gtk_file_chooser_get_filename(chooser);
+        if (filename)
+        {
+            result = filename;
+            g_free(filename);
+        }
+    }
+
+    g_object_unref(native);
+    while (gtk_events_pending())
+        gtk_main_iteration();
+    return result;
+}
+
+std::string select_folder_dialog(const std::string &title, const std::string &initial_path)
+{
+    if (!gtk_init_check(nullptr, nullptr))
+    {
+        return "";
+    }
+
+    GtkFileChooserNative *native = gtk_file_chooser_native_new(
+        title.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, "_Select", "_Cancel");
+
+    GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
+
+    if (!initial_path.empty() && std::filesystem::exists(initial_path))
+    {
+        gtk_file_chooser_set_current_folder(chooser, initial_path.c_str());
+    }
+
+    std::string result;
+    
+    gint response = gtk_native_dialog_run(GTK_NATIVE_DIALOG(native));
+    
+    while (gtk_events_pending())
+    {
+        gtk_main_iteration();
+        glfwPollEvents();
+    }
+    
+    if (response == GTK_RESPONSE_ACCEPT)
+    {
+        char *filename = gtk_file_chooser_get_filename(chooser);
+        if (filename)
+        {
+            result = filename;
+            g_free(filename);
+        }
+    }
+
+    g_object_unref(native);
+    while (gtk_events_pending())
+        gtk_main_iteration();
+    return result;
+}
+
+} // namespace file_dialogs
+#endif
--- a/src/gui/platform/linux/font_loader_linux.cpp
+++ b/src/gui/platform/linux/font_loader_linux.cpp
@@ -0,0 +1,106 @@
+#ifdef __linux__
+
+#include "core/config/config.hpp"
+#include "gui/platform/font_loader.hpp"
+#include "imgui_internal.h"
+#include <algorithm>
+#include <fontconfig/fontconfig.h>
+#include <imgui.h>
+#include <GLFW/glfw3.h>
+
+std::string font_loader::find_font_linux(const char *font_name)
+{
+    glfwPollEvents();
+    
+    FcInit();
+
+    FcPattern *pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_name));
+    if (!pattern)
+        return {};
+
+    FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
+    FcDefaultSubstitute(pattern);
+
+    FcResult result;
+    FcPattern *match = FcFontMatch(nullptr, pattern, &result);
+
+    std::string out;
+
+    if (match)
+    {
+        FcChar8 *file = nullptr;
+        if (FcPatternGetString(match, FC_FILE, 0, &file) == FcResultMatch)
+            out = reinterpret_cast<const char *>(file);
+
+        FcPatternDestroy(match);
+    }
+
+    FcPatternDestroy(pattern);
+    return out;
+}
+
+std::string font_loader::find_font_path(const char *font_name)
+{
+    return find_font_linux(font_name);
+}
+
+ImFont *font_loader::load_font(const char *font_name, float size_px)
+{
+    std::string path = find_font_path(font_name);
+    if (path.empty())
+        return nullptr;
+
+    float scale = ImGui::GetIO().DisplayFramebufferScale.y;
+    return ImGui::GetIO().Fonts->AddFontFromFileTTF(path.c_str(), size_px * scale);
+}
+
+void font_loader::push_default_font()
+{
+    ImGui::PushFont(ImGui::GetDefaultFont(), clrsync::core::config::instance().font_size());
+}
+
+void font_loader::pop_font()
+{
+    ImGui::PopFont();
+}
+
+std::vector<std::string> font_loader::get_system_fonts()
+{
+    std::vector<std::string> fonts;
+
+    glfwPollEvents();
+    
+    FcInit();
+    FcPattern *pattern = FcPatternCreate();
+    FcObjectSet *os = FcObjectSetBuild(FC_FAMILY, nullptr);
+    FcFontSet *fs = FcFontList(nullptr, pattern, os);
+
+    if (fs)
+    {
+        for (int i = 0; i < fs->nfont; i++)
+        {
+            // TODO: should change this to something sane
+            if (i % 100 == 0)
+            {
+                glfwPollEvents();
+            }
+            
+            FcChar8 *family = nullptr;
+            if (FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch)
+            {
+                std::string font_name = reinterpret_cast<const char *>(family);
+                if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
+                    fonts.push_back(font_name);
+            }
+        }
+        FcFontSetDestroy(fs);
+    }
+
+    FcObjectSetDestroy(os);
+    FcPatternDestroy(pattern);
+
+    std::sort(fonts.begin(), fonts.end());
+    return fonts;
+}
+
+#endif
--- a/src/gui/platform/macos/file_browser_macos.mm
+++ b/src/gui/platform/macos/file_browser_macos.mm
@@ -1,7 +1,6 @@
-#include "file_browser.hpp"
-#include <filesystem>
-
 #ifdef __APPLE__
+#include "gui/platform/file_browser.hpp"
+#include <filesystem>
 #include <Cocoa/Cocoa.h>

 namespace file_dialogs {
@@ -76,5 +75,4 @@ std::string select_folder_dialog(const std::string& title,
 }

 }
-
 #endif
--- a/src/gui/platform/macos/font_loader_macos.cpp
+++ b/src/gui/platform/macos/font_loader_macos.cpp
@@ -0,0 +1,115 @@
+#ifdef __APPLE__
+
+#include "core/config/config.hpp"
+#include "gui/platform/font_loader.hpp"
+#include "imgui_internal.h"
+#include <CoreText/CoreText.h>
+#include <algorithm>
+#include <imgui.h>
+
+std::vector<unsigned char> font_loader::load_font_macos(const char *font_name)
+{
+    std::vector<unsigned char> out;
+
+    CFStringRef cf_name = CFStringCreateWithCString(nullptr, font_name, kCFStringEncodingUTF8);
+    if (!cf_name)
+        return out;
+
+    CTFontDescriptorRef desc = CTFontDescriptorCreateWithNameAndSize(cf_name, 12);
+    CFRelease(cf_name);
+
+    if (!desc)
+        return out;
+
+    CFURLRef url = (CFURLRef)CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute);
+    CFRelease(desc);
+
+    if (!url)
+        return out;
+
+    CFDataRef data = nullptr;
+    Boolean success = CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, url, &data,
+                                                               nullptr, nullptr, nullptr);
+    CFRelease(url);
+
+    if (success && data)
+    {
+        CFIndex size = CFDataGetLength(data);
+        if (size > 100)
+        {
+            out.resize(size);
+            CFDataGetBytes(data, CFRangeMake(0, size), out.data());
+        }
+        CFRelease(data);
+    }
+
+    return out;
+}
+
+std::string font_loader::find_font_path(const char *font_name)
+{
+    (void)font_name;
+    return {};
+}
+
+ImFont *font_loader::load_font(const char *font_name, float size_px)
+{
+    std::vector<unsigned char> buf = load_font_macos(font_name);
+    if (buf.empty())
+        return nullptr;
+
+    return ImGui::GetIO().Fonts->AddFontFromMemoryTTF(buf.data(), static_cast<int>(buf.size()),
+                                                      size_px);
+}
+
+void font_loader::push_default_font()
+{
+    ImGui::PushFont(ImGui::GetDefaultFont(), clrsync::core::config::instance().font_size());
+}
+
+void font_loader::pop_font()
+{
+    ImGui::PopFont();
+}
+
+std::vector<std::string> font_loader::get_system_fonts()
+{
+    std::vector<std::string> fonts;
+
+    CTFontCollectionRef collection = CTFontCollectionCreateFromAvailableFonts(nullptr);
+    if (collection)
+    {
+        CFArrayRef fontDescriptors = CTFontCollectionCreateMatchingFontDescriptors(collection);
+        CFRelease(collection);
+
+        if (fontDescriptors)
+        {
+            CFIndex count = CFArrayGetCount(fontDescriptors);
+            for (CFIndex i = 0; i < count; i++)
+            {
+                CTFontDescriptorRef descriptor =
+                    (CTFontDescriptorRef)CFArrayGetValueAtIndex(fontDescriptors, i);
+                CFStringRef fontName = (CFStringRef)CTFontDescriptorCopyAttribute(
+                    descriptor, kCTFontDisplayNameAttribute);
+
+                if (fontName)
+                {
+                    char buffer[256];
+                    if (CFStringGetCString(fontName, buffer, sizeof(buffer), kCFStringEncodingUTF8))
+                    {
+                        std::string font_name = buffer;
+                        if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
+                            fonts.push_back(font_name);
+                    }
+                    CFRelease(fontName);
+                }
+            }
+            CFRelease(fontDescriptors);
+        }
+    }
+
+    std::sort(fonts.begin(), fonts.end());
+    return fonts;
+}
+
+#endif
--- a/src/gui/platform/windows/file_browser_windows.cpp
+++ b/src/gui/platform/windows/file_browser_windows.cpp
@@ -0,0 +1,167 @@
+#ifdef _WIN32
+
+// clang-format off
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <commdlg.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+// clang-format on
+
+#include "gui/platform/file_browser.hpp"
+#include <filesystem>
+
+namespace file_dialogs
+{
+
+std::string open_file_dialog(const std::string &title, const std::string &initial_path,
+                             const std::vector<std::string> &filters)
+{
+    OPENFILENAMEA ofn;
+    char file[MAX_PATH] = "";
+
+    std::string filter_str = "All Files (*.*)\0*.*\0";
+
+    ZeroMemory(&ofn, sizeof(ofn));
+    ofn.lStructSize = sizeof(ofn);
+    ofn.hwndOwner = GetActiveWindow();
+    ofn.lpstrFile = file;
+    ofn.nMaxFile = sizeof(file);
+    ofn.lpstrFilter = filter_str.c_str();
+    ofn.nFilterIndex = 1;
+    ofn.lpstrTitle = title.c_str();
+    ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
+
+    if (!initial_path.empty() && std::filesystem::exists(initial_path))
+    {
+        std::filesystem::path p(initial_path);
+        if (std::filesystem::is_directory(p))
+        {
+            ofn.lpstrInitialDir = initial_path.c_str();
+        }
+        else
+        {
+            std::string dir = p.parent_path().string();
+            std::string name = p.filename().string();
+            ofn.lpstrInitialDir = dir.c_str();
+            strncpy(file, name.c_str(), sizeof(file) - 1);
+        }
+    }
+
+    if (GetOpenFileNameA(&ofn))
+    {
+        return std::string(file);
+    }
+    return "";
+}
+
+std::string save_file_dialog(const std::string &title, const std::string &initial_path,
+                             const std::vector<std::string> &filters)
+{
+    OPENFILENAMEA ofn;
+    char file[MAX_PATH] = "";
+
+    std::string filter_str = "All Files\0*.*\0\0";
+
+    ZeroMemory(&ofn, sizeof(ofn));
+    ofn.lStructSize = sizeof(ofn);
+    ofn.hwndOwner = GetActiveWindow();
+    ofn.lpstrFile = file;
+    ofn.nMaxFile = sizeof(file);
+    ofn.lpstrFilter = filter_str.c_str();
+    ofn.nFilterIndex = 1;
+    ofn.lpstrTitle = title.c_str();
+    ofn.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_NOCHANGEDIR;
+
+    if (!initial_path.empty())
+    {
+        std::filesystem::path p(initial_path);
+        if (std::filesystem::exists(p) && std::filesystem::is_directory(p))
+        {
+            ofn.lpstrInitialDir = initial_path.c_str();
+        }
+        else
+        {
+            std::string dir = p.parent_path().string();
+            std::string name = p.filename().string();
+            if (std::filesystem::exists(dir))
+            {
+                ofn.lpstrInitialDir = dir.c_str();
+                strncpy(file, name.c_str(), sizeof(file) - 1);
+            }
+        }
+    }
+
+    if (GetSaveFileNameA(&ofn))
+    {
+        return std::string(file);
+    }
+    return "";
+}
+
+std::string select_folder_dialog(const std::string &title, const std::string &initial_path)
+{
+    IFileOpenDialog *pFileOpen;
+
+    HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_ALL, IID_IFileOpenDialog,
+                                  reinterpret_cast<void **>(&pFileOpen));
+
+    if (SUCCEEDED(hr))
+    {
+        DWORD dwFlags;
+        if (SUCCEEDED(pFileOpen->GetOptions(&dwFlags)))
+        {
+            pFileOpen->SetOptions(dwFlags | FOS_PICKFOLDERS);
+        }
+
+        std::wstring wtitle(title.begin(), title.end());
+        pFileOpen->SetTitle(wtitle.c_str());
+
+        if (!initial_path.empty() && std::filesystem::exists(initial_path))
+        {
+            IShellItem *psi = NULL;
+            std::wstring winitial(initial_path.begin(), initial_path.end());
+            hr = SHCreateItemFromParsingName(winitial.c_str(), NULL, IID_IShellItem, (void **)&psi);
+            if (SUCCEEDED(hr))
+            {
+                pFileOpen->SetFolder(psi);
+                psi->Release();
+            }
+        }
+
+        hr = pFileOpen->Show(GetActiveWindow());
+
+        if (SUCCEEDED(hr))
+        {
+            IShellItem *pItem;
+            hr = pFileOpen->GetResult(&pItem);
+            if (SUCCEEDED(hr))
+            {
+                PWSTR pszFilePath;
+                hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &pszFilePath);
+
+                if (SUCCEEDED(hr))
+                {
+                    std::wstring wpath(pszFilePath);
+                    int size = WideCharToMultiByte(CP_UTF8, 0, wpath.c_str(), -1, nullptr, 0,
+                                                   nullptr, nullptr);
+                    std::string result(size - 1, 0);
+                    WideCharToMultiByte(CP_UTF8, 0, wpath.c_str(), -1, &result[0], size, nullptr,
+                                        nullptr);
+                    CoTaskMemFree(pszFilePath);
+                    pItem->Release();
+                    pFileOpen->Release();
+                    return result;
+                }
+                pItem->Release();
+            }
+        }
+        pFileOpen->Release();
+    }
+
+    return "";
+}
+
+} // namespace file_dialogs
+
+#endif
--- a/src/gui/platform/windows/font_loader_windows.cpp
+++ b/src/gui/platform/windows/font_loader_windows.cpp
@@ -0,0 +1,170 @@
+#ifdef _WIN32
+#include "core/config/config.hpp"
+#include "gui/platform/font_loader.hpp"
+#include "imgui_internal.h"
+#include <algorithm>
+#include <imgui.h>
+#include <windows.h>
+#include <winreg.h>
+
+static std::string search_registry_for_font(HKEY root_key, const char *subkey,
+                                            const std::string &font_name_lower,
+                                            const char *default_font_dir)
+{
+    HKEY hKey;
+    LONG result = RegOpenKeyExA(root_key, subkey, 0, KEY_READ, &hKey);
+
+    if (result != ERROR_SUCCESS)
+        return {};
+
+    char value_name[512];
+    BYTE value_data[512];
+    DWORD value_name_size, value_data_size, type;
+    DWORD index = 0;
+
+    std::string found_path;
+
+    while (true)
+    {
+        value_name_size = sizeof(value_name);
+        value_data_size = sizeof(value_data);
+
+        result = RegEnumValueA(hKey, index++, value_name, &value_name_size, nullptr, &type,
+                               value_data, &value_data_size);
+
+        if (result != ERROR_SUCCESS)
+            break;
+
+        if (type != REG_SZ)
+            continue;
+
+        std::string reg_font_name = value_name;
+        std::transform(reg_font_name.begin(), reg_font_name.end(), reg_font_name.begin(),
+                       ::tolower);
+
+        std::string reg_font_name_clean = reg_font_name;
+        size_t type_pos = reg_font_name_clean.find(" (");
+        if (type_pos != std::string::npos)
+            reg_font_name_clean = reg_font_name_clean.substr(0, type_pos);
+
+        if (reg_font_name_clean == font_name_lower)
+        {
+            std::string font_file = reinterpret_cast<char *>(value_data);
+
+            // If path is not absolute, prepend default font directory
+            if (font_file.find(":\\") == std::string::npos)
+            {
+                found_path = std::string(default_font_dir) + "\\" + font_file;
+            }
+            else
+            {
+                found_path = font_file;
+            }
+            break;
+        }
+    }
+
+    RegCloseKey(hKey);
+    return found_path;
+}
+
+std::string font_loader::find_font_windows(const char *font_name)
+{
+    std::string font_name_lower = font_name;
+    std::transform(font_name_lower.begin(), font_name_lower.end(), font_name_lower.begin(),
+                   ::tolower);
+
+    char windows_dir[MAX_PATH];
+    GetWindowsDirectoryA(windows_dir, MAX_PATH);
+    std::string system_fonts_dir = std::string(windows_dir) + "\\Fonts";
+
+    // First, try system-wide fonts (HKEY_LOCAL_MACHINE)
+    std::string path = search_registry_for_font(
+        HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
+        font_name_lower, system_fonts_dir.c_str());
+
+    if (!path.empty())
+        return path;
+
+    // If not found, try per-user fonts (HKEY_CURRENT_USER)
+    char local_appdata[MAX_PATH];
+    if (GetEnvironmentVariableA("LOCALAPPDATA", local_appdata, MAX_PATH) > 0)
+    {
+        std::string user_fonts_dir = std::string(local_appdata) + "\\Microsoft\\Windows\\Fonts";
+
+        path = search_registry_for_font(HKEY_CURRENT_USER,
+                                        "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
+                                        font_name_lower, user_fonts_dir.c_str());
+    }
+
+    return path;
+}
+
+std::string font_loader::find_font_path(const char *font_name)
+{
+    return find_font_windows(font_name);
+}
+
+ImFont *font_loader::load_font(const char *font_name, float size_px)
+{
+    std::string path = find_font_path(font_name);
+    if (path.empty())
+        return nullptr;
+
+    float scale = ImGui::GetIO().DisplayFramebufferScale.y;
+    return ImGui::GetIO().Fonts->AddFontFromFileTTF(path.c_str(), size_px * scale);
+}
+
+void font_loader::push_default_font()
+{
+    ImGui::PushFont(ImGui::GetDefaultFont(), clrsync::core::config::instance().font_size());
+}
+
+void font_loader::pop_font()
+{
+    ImGui::PopFont();
+}
+
+std::vector<std::string> font_loader::get_system_fonts()
+{
+    std::vector<std::string> fonts;
+
+    auto enumerate_registry_fonts = [&fonts](HKEY root_key, const char *subkey) {
+        HKEY hKey;
+        if (RegOpenKeyExA(root_key, subkey, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+            return;
+
+        char value_name[512];
+        DWORD value_name_size;
+        DWORD index = 0;
+
+        while (true)
+        {
+            value_name_size = sizeof(value_name);
+            LONG result = RegEnumValueA(hKey, index++, value_name, &value_name_size, nullptr,
+                                        nullptr, nullptr, nullptr);
+
+            if (result != ERROR_SUCCESS)
+                break;
+
+            std::string font_name = value_name;
+            size_t pos = font_name.find(" (");
+            if (pos != std::string::npos)
+                font_name = font_name.substr(0, pos);
+
+            if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
+                fonts.push_back(font_name);
+        }
+
+        RegCloseKey(hKey);
+    };
+
+    enumerate_registry_fonts(HKEY_LOCAL_MACHINE,
+                             "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts");
+    enumerate_registry_fonts(HKEY_CURRENT_USER,
+                             "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts");
+
+    std::sort(fonts.begin(), fonts.end());
+    return fonts;
+}
+#endif
--- a/src/gui/settings_window.cpp
+++ b/src/gui/settings_window.cpp
@@ -1,370 +0,0 @@
-#include "settings_window.hpp"
-#include "core/config/config.hpp"
-#include "core/error.hpp"
-#include "gui/font_loader.hpp"
-#include "gui/imgui_helpers.hpp"
-#include "gui/file_browser.hpp"
-#include "imgui.h"
-#include <cstring>
-
-settings_window::settings_window()
-    : m_font_size(14), m_selected_font_idx(0), m_settings_changed(false), m_current_tab(0)
-{
-    m_default_theme[0] = '\0';
-    m_palettes_path[0] = '\0';
-    m_font[0] = '\0';
-    
-    font_loader loader;
-    m_available_fonts = loader.get_system_fonts();
-    
-    load_settings();
-}
-
-void settings_window::render()
-{
-    if (!m_visible)
-        return;
-
-    ImGui::SetNextWindowSize(ImVec2(700, 500), ImGuiCond_FirstUseEver);
-    ImGui::SetNextWindowPos(ImGui::GetMainViewport()->GetCenter(), ImGuiCond_FirstUseEver, ImVec2(0.5f, 0.5f));
-    
-    ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoCollapse;
-    if (ImGui::Begin("Settings", &m_visible, window_flags))
-    {
-        if (ImGui::BeginTabBar("SettingsTabs", ImGuiTabBarFlags_None))
-        {
-            if (ImGui::BeginTabItem("General"))
-            {
-                render_general_tab();
-                ImGui::EndTabItem();
-            }
-            
-            if (ImGui::BeginTabItem("Appearance"))
-            {
-                render_appearance_tab();
-                ImGui::EndTabItem();
-            }
-            
-            ImGui::EndTabBar();
-        }
-        
-        render_status_messages();
-        
-        ImGui::Separator();
-        render_action_buttons();
-    }
-    ImGui::End();
-}
-
-void settings_window::load_settings()
-{
-    auto& cfg = clrsync::core::config::instance();
-    
-    std::string default_theme = cfg.default_theme();
-    strncpy(m_default_theme, default_theme.c_str(), sizeof(m_default_theme) - 1);
-    m_default_theme[sizeof(m_default_theme) - 1] = '\0';
-    
-    std::string palettes_path = cfg.palettes_path();
-    strncpy(m_palettes_path, palettes_path.c_str(), sizeof(m_palettes_path) - 1);
-    m_palettes_path[sizeof(m_palettes_path) - 1] = '\0';
-    
-    std::string font = cfg.font();
-    strncpy(m_font, font.c_str(), sizeof(m_font) - 1);
-    m_font[sizeof(m_font) - 1] = '\0';
-    
-    m_selected_font_idx = 0;
-    for (int i = 0; i < static_cast<int>(m_available_fonts.size()); i++)
-    {
-        if (m_available_fonts[i] == font)
-        {
-            m_selected_font_idx = i;
-            break;
-        }
-    }
-    
-    m_font_size = cfg.font_size();
-    
-    m_error_message.clear();
-    m_settings_changed = false;
-}
-
-void settings_window::apply_settings()
-{
-    auto& cfg = clrsync::core::config::instance();
-    
-    if (strlen(m_default_theme) == 0)
-    {
-        m_error_message = "Default theme cannot be empty";
-        return;
-    }
-    
-    if (strlen(m_palettes_path) == 0)
-    {
-        m_error_message = "Palettes path cannot be empty";
-        return;
-    }
-    
-    if (strlen(m_font) == 0)
-    {
-        m_error_message = "Font cannot be empty";
-        return;
-    }
-    
-    if (m_font_size < 8 || m_font_size > 48)
-    {
-        m_error_message = "Font size must be between 8 and 48";
-        return;
-    }
-    
-    auto result1 = cfg.set_default_theme(m_default_theme);
-    if (!result1)
-    {
-        m_error_message = "Failed to set default theme: " + result1.error().description();
-        return;
-    }
-    
-    auto result2 = cfg.set_palettes_path(m_palettes_path);
-    if (!result2)
-    {
-        m_error_message = "Failed to set palettes path: " + result2.error().description();
-        return;
-    }
-    
-    auto result3 = cfg.set_font(m_font);
-    if (!result3)
-    {
-        m_error_message = "Failed to set font: " + result3.error().description();
-        return;
-    }
-    
-    auto result4 = cfg.set_font_size(m_font_size);
-    if (!result4)
-    {
-        m_error_message = "Failed to set font size: " + result4.error().description();
-        return;
-    }
-
-    font_loader fn_loader;
-    auto font = fn_loader.load_font(m_font, m_font_size);
-    if (font)
-        ImGui::GetIO().FontDefault = font;
-    
-    m_error_message.clear();
-    m_settings_changed = false;
-}
-
-void settings_window::render_general_tab()
-{
-    ImGui::Spacing();
-    
-    auto accent_color = palette_utils::get_color(m_current_palette, "accent");
-    ImGui::TextColored(accent_color, "Theme Settings");
-    ImGui::Separator();
-    ImGui::Spacing();
-    
-    ImGui::Text("Default Theme:");
-    ImGui::SameLine();
-    show_help_marker("The default color scheme to load on startup");
-    ImGui::SetNextItemWidth(-100.0f);
-    if (ImGui::InputText("##default_theme", m_default_theme, sizeof(m_default_theme)))
-        m_settings_changed = true;
-    
-    ImGui::Spacing();
-    
-    ImGui::TextColored(accent_color, "Path Settings");
-    ImGui::Separator();
-    ImGui::Spacing();
-    
-    ImGui::Text("Palettes Directory:");
-    ImGui::SameLine();
-    show_help_marker("Directory where color palettes are stored\nSupports ~ for home directory");
-    ImGui::SetNextItemWidth(-120.0f);
-    if (ImGui::InputText("##palettes_path", m_palettes_path, sizeof(m_palettes_path)))
-        m_settings_changed = true;
-    ImGui::SameLine();
-    if (ImGui::Button("Browse"))
-    {
-        std::string selected_path = file_dialogs::select_folder_dialog("Select Palettes Directory", m_palettes_path);
-        if (!selected_path.empty()) {
-            strncpy(m_palettes_path, selected_path.c_str(), sizeof(m_palettes_path) - 1);
-            m_palettes_path[sizeof(m_palettes_path) - 1] = '\0';
-            m_settings_changed = true;
-        }
-    }
-}
-
-void settings_window::render_appearance_tab()
-{
-    ImGui::Spacing();
-    
-    auto accent_color = palette_utils::get_color(m_current_palette, "accent");
-    ImGui::TextColored(accent_color, "Font Settings");
-    ImGui::Separator();
-    ImGui::Spacing();
-    
-    ImGui::Text("Font Family:");
-    ImGui::SameLine();
-    show_help_marker("Select font family for the application interface");
-    ImGui::SetNextItemWidth(-1.0f);
-    if (ImGui::BeginCombo("##font", m_font))
-    {
-        for (int i = 0; i < static_cast<int>(m_available_fonts.size()); i++)
-        {
-            bool is_selected = (i == m_selected_font_idx);
-            if (ImGui::Selectable(m_available_fonts[i].c_str(), is_selected))
-            {
-                m_selected_font_idx = i;
-                strncpy(m_font, m_available_fonts[i].c_str(), sizeof(m_font) - 1);
-                m_font[sizeof(m_font) - 1] = '\0';
-                m_settings_changed = true;
-            }
-            if (is_selected)
-                ImGui::SetItemDefaultFocus();
-        }
-        ImGui::EndCombo();
-    }
-    
-    ImGui::Spacing();
-    
-    ImGui::Text("Font Size:");
-    ImGui::SameLine();
-    show_help_marker("Font size for the application interface (8-48)");
-    ImGui::SetNextItemWidth(120.0f);
-    int old_size = m_font_size;
-    if (ImGui::SliderInt("##font_size", &m_font_size, 8, 48, "%d px"))
-    {
-        if (old_size != m_font_size)
-            m_settings_changed = true;
-    }
-    
-    ImGui::SameLine();
-    if (ImGui::Button("Reset"))
-    {
-        m_font_size = 14;
-        m_settings_changed = true;
-    }
-}
-
-void settings_window::render_status_messages()
-{
-    if (!m_error_message.empty())
-    {
-        ImGui::Spacing();
-        
-        auto error_bg_color = palette_utils::get_color(m_current_palette, "error");
-        auto error_text_color = palette_utils::get_color(m_current_palette, "on_error");
-        
-        ImGui::PushStyleColor(ImGuiCol_ChildBg, error_bg_color);
-        ImGui::PushStyleColor(ImGuiCol_Border, error_bg_color);
-        ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 4.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_ChildBorderSize, 1.0f);
-        
-        if (ImGui::BeginChild("##error_box", ImVec2(0, 0), ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_Borders))
-        {
-            ImGui::PushStyleColor(ImGuiCol_Text, error_text_color);
-            ImGui::TextWrapped("Error: %s", m_error_message.c_str());
-            ImGui::PopStyleColor();
-            
-            ImGui::Spacing();
-            
-            ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(error_bg_color.x * 0.8f, error_bg_color.y * 0.8f, error_bg_color.z * 0.8f, error_bg_color.w));
-            ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(error_bg_color.x * 0.6f, error_bg_color.y * 0.6f, error_bg_color.z * 0.6f, error_bg_color.w));
-            ImGui::PushStyleColor(ImGuiCol_Text, error_text_color);
-            
-            if (ImGui::Button("Dismiss##error"))
-                m_error_message.clear();
-                
-            ImGui::PopStyleColor(3);
-        }
-        ImGui::EndChild();
-        
-        ImGui::PopStyleVar(2);
-        ImGui::PopStyleColor(2);
-    }
-}
-
-void settings_window::render_action_buttons()
-{
-    ImGui::Spacing();
-    
-    float button_width = 100.0f;
-    float spacing = ImGui::GetStyle().ItemSpacing.x;
-    float window_width = ImGui::GetContentRegionAvail().x;
-    
-    float total_buttons_width = 4 * button_width + 3 * spacing;
-    float start_pos = (window_width - total_buttons_width) * 0.5f;
-    
-    if (start_pos > 0)
-        ImGui::SetCursorPosX(ImGui::GetCursorPosX() + start_pos);
-    
-    if (ImGui::Button("OK", ImVec2(button_width, 0)))
-    {
-        apply_settings();
-        if (m_error_message.empty())
-        {
-            m_visible = false;
-            m_settings_changed = false;
-        }
-    }
-    
-    ImGui::SameLine();
-    
-    bool apply_disabled = !m_settings_changed;
-    if (apply_disabled)
-    {
-        ImGui::PushStyleVar(ImGuiStyleVar_Alpha, 0.5f);
-    }
-    
-    if (ImGui::Button("Apply", ImVec2(button_width, 0)) && !apply_disabled)
-    {
-        apply_settings();
-        if (m_error_message.empty())
-        {
-            m_settings_changed = false;
-        }
-    }
-    
-    if (apply_disabled)
-    {
-        ImGui::PopStyleVar();
-    }
-    
-    ImGui::SameLine();
-    
-    if (ImGui::Button("Reset", ImVec2(button_width, 0)))
-    {
-        reset_to_defaults();
-    }
-    
-    ImGui::SameLine();
-    
-    if (ImGui::Button("Cancel", ImVec2(button_width, 0)))
-    {
-        load_settings();
-        m_visible = false;
-        m_error_message.clear();
-        m_settings_changed = false;
-    }
-}
-
-void settings_window::show_help_marker(const char* desc)
-{
-    ImGui::TextDisabled("(?)");
-    if (ImGui::BeginItemTooltip())
-    {
-        ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
-        ImGui::TextUnformatted(desc);
-        ImGui::PopTextWrapPos();
-        ImGui::EndTooltip();
-    }
-}
-
-void settings_window::reset_to_defaults()
-{
-    strncpy(m_default_theme, "dark", sizeof(m_default_theme));
-    strncpy(m_palettes_path, "~/.config/clrsync/palettes", sizeof(m_palettes_path));
-    strncpy(m_font, "JetBrains Mono Nerd Font", sizeof(m_font));
-    m_font_size = 14;
-    m_error_message.clear();
-    m_settings_changed = true;
-}
--- a/src/gui/settings_window.hpp
+++ b/src/gui/settings_window.hpp
@@ -1,50 +0,0 @@
-#ifndef CLRSYNC_GUI_SETTINGS_WINDOW_HPP
-#define CLRSYNC_GUI_SETTINGS_WINDOW_HPP
-
-#include "core/palette/palette.hpp"
-#include <string>
-#include <vector>
-
-class settings_window
-{
-public:
-    settings_window();
-    void render();
-    void show() { m_visible = true; }
-    void hide() { m_visible = false; }
-    bool is_visible() const { return m_visible; }
-
-private:
-    void load_settings();
-    void save_settings();
-    void apply_settings();
-    void render_general_tab();
-    void render_appearance_tab();
-    void render_status_messages();
-    void render_action_buttons();
-    void show_help_marker(const char* desc);
-    void reset_to_defaults();
-    
-public:
-    void set_palette(const clrsync::core::palette& palette) { 
-        m_current_palette = palette; 
-    }
-
-    bool m_visible{false};
-    
-    char m_default_theme[128];
-    char m_palettes_path[512];
-    char m_font[128];
-    int m_font_size;
-    
-    std::vector<std::string> m_available_fonts;
-    int m_selected_font_idx;
-    
-    std::string m_error_message;
-    bool m_settings_changed;
-    int m_current_tab;
-    
-    clrsync::core::palette m_current_palette;
-};
-
-#endif // CLRSYNC_GUI_SETTINGS_WINDOW_HPP
--- a/src/gui/ui_manager.cpp
+++ b/src/gui/ui_manager.cpp
@@ -0,0 +1,137 @@
+#include "gui/ui_manager.hpp"
+#include "gui/backend/backend.hpp"
+#include "gui/platform/font_loader.hpp"
+#include "gui/platform/file_browser.hpp"
+#include "core/config/config.hpp"
+
+#include <imgui.h>
+
+namespace clrsync::gui
+{
+ui_manager::ui_manager(backend::backend_interface* backend)
+    : m_backend(backend)
+{
+    m_font_loader = new font_loader();
+}
+
+ui_manager::~ui_manager()
+{
+    shutdown();
+    delete m_font_loader;
+    m_font_loader = nullptr;
+}
+
+bool ui_manager::initialize(const ui_config& config)
+{
+    IMGUI_CHECKVERSION();
+    m_imgui_context = ImGui::CreateContext();
+    if (!m_imgui_context)
+    {
+        return false;
+    }
+
+    ImGuiIO& io = ImGui::GetIO();
+    
+    if (config.enable_docking)
+        io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+    
+    if (config.enable_keyboard_nav)
+        io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+    
+    if (!config.ini_path.empty())
+        io.IniFilename = config.ini_path.c_str();
+
+    ImGui::StyleColorsDark();
+
+    if (!m_backend->init_imgui_backend())
+    {
+        ImGui::DestroyContext(static_cast<ImGuiContext*>(m_imgui_context));
+        m_imgui_context = nullptr;
+        return false;
+    }
+
+    ImFont *font = m_font_loader->load_font(
+        clrsync::core::config::instance().font().c_str(),
+        clrsync::core::config::instance().font_size());
+
+    if (font)
+        io.FontDefault = font;
+
+    return true;
+}
+
+void ui_manager::shutdown()
+{
+    if (m_imgui_context)
+    {
+        m_backend->shutdown_imgui_backend();
+        ImGui::DestroyContext(static_cast<ImGuiContext*>(m_imgui_context));
+        m_imgui_context = nullptr;
+    }
+}
+
+void ui_manager::begin_frame()
+{
+    m_backend->imgui_new_frame();
+    ImGui::NewFrame();
+}
+
+void ui_manager::end_frame()
+{
+    ImGui::Render();
+    m_backend->imgui_render_draw_data(ImGui::GetDrawData());
+}
+
+void ui_manager::push_default_font()
+{
+    if (m_font_loader)
+        m_font_loader->push_default_font();
+}
+
+void ui_manager::pop_font()
+{
+    if (m_font_loader)
+        m_font_loader->pop_font();
+}
+
+std::vector<std::string> ui_manager::get_system_fonts() const
+{
+    if (m_font_loader)
+        return m_font_loader->get_system_fonts();
+    return {};
+}
+
+bool ui_manager::reload_font(const char* font_name, float size)
+{
+    if (!m_font_loader)
+        return false;
+    
+    ImFont* font = m_font_loader->load_font(font_name, size);
+    if (font)
+    {
+        ImGui::GetIO().FontDefault = font;
+        return true;
+    }
+    return false;
+}
+
+std::string ui_manager::open_file_dialog(const std::string& title,
+                                          const std::string& initial_path,
+                                          const std::vector<std::string>& filters)
+{
+    return file_dialogs::open_file_dialog(title, initial_path, filters);
+}
+
+std::string ui_manager::save_file_dialog(const std::string& title,
+                                          const std::string& initial_path,
+                                          const std::vector<std::string>& filters)
+{
+    return file_dialogs::save_file_dialog(title, initial_path, filters);
+}
+
+std::string ui_manager::select_folder_dialog(const std::string& title,
+                                              const std::string& initial_path)
+{
+    return file_dialogs::select_folder_dialog(title, initial_path);
+}
+}
--- a/src/gui/ui_manager.hpp
+++ b/src/gui/ui_manager.hpp
@@ -0,0 +1,58 @@
+#ifndef CLRSYNC_UI_MANAGER_HPP
+#define CLRSYNC_UI_MANAGER_HPP
+#include <string>
+#include <vector>
+
+class font_loader;
+struct ImFont;
+
+namespace clrsync::gui::backend
+{
+class backend_interface;
+}
+
+namespace clrsync::gui
+{
+
+struct ui_config
+{
+    std::string ini_path = "";
+    bool enable_docking = true;
+    bool enable_keyboard_nav = true;
+};
+
+class ui_manager
+{
+public:
+    explicit ui_manager(backend::backend_interface *backend);
+    ~ui_manager();
+
+    bool initialize(const ui_config& config = ui_config());
+    void shutdown();
+
+    void begin_frame();
+    void end_frame();
+
+    void push_default_font();
+    void pop_font();
+
+    std::vector<std::string> get_system_fonts() const;
+    bool reload_font(const char* font_name, float size);
+
+    std::string open_file_dialog(const std::string& title = "Open File",
+                                  const std::string& initial_path = "",
+                                  const std::vector<std::string>& filters = {});
+    std::string save_file_dialog(const std::string& title = "Save File",
+                                  const std::string& initial_path = "",
+                                  const std::vector<std::string>& filters = {});
+    std::string select_folder_dialog(const std::string& title = "Select Folder",
+                                      const std::string& initial_path = "");
+
+private:
+    backend::backend_interface *m_backend;
+    void *m_imgui_context = nullptr;
+    font_loader *m_font_loader = nullptr;
+};
+}
+
+#endif
--- a/src/gui/views/about_window.cpp
+++ b/src/gui/views/about_window.cpp
@@ -0,0 +1,66 @@
+#include "gui/views/about_window.hpp"
+#include "core/common/version.hpp"
+#include "gui/widgets/centered_text.hpp"
+#include "gui/widgets/colors.hpp"
+#include "gui/widgets/link_button.hpp"
+#include "imgui.h"
+
+about_window::about_window() = default;
+
+void about_window::render(const clrsync::core::palette &pal)
+{
+    if (!m_visible)
+        return;
+
+    ImGui::SetNextWindowSize(ImVec2(500, 400), ImGuiCond_FirstUseEver);
+
+    if (ImGui::Begin("About clrsync", &m_visible, ImGuiWindowFlags_NoResize))
+    {
+        using namespace clrsync::gui::widgets;
+
+        ImVec4 title_color = palette_color(pal, "info", "accent");
+        centered_text("clrsync", title_color);
+
+        ImVec4 subtitle_color = palette_color(pal, "editor_inactive", "foreground");
+        centered_text("Version " + clrsync::core::version_string(), subtitle_color);
+
+        ImGui::Spacing();
+        ImGui::Separator();
+        ImGui::Spacing();
+
+        ImGui::TextWrapped("A color scheme management tool.");
+
+        ImGui::Spacing();
+        ImGui::Spacing();
+        ImGui::Separator();
+        ImGui::Spacing();
+
+        constexpr float button_width = 200.0f;
+        float spacing = ImGui::GetStyle().ItemSpacing.x;
+        float total_width = 2.0f * button_width + spacing;
+
+        centered_buttons(total_width, [button_width]() {
+            link_button("GitHub Repository", "https://github.com/obsqrbtz/clrsync", button_width);
+            ImGui::SameLine();
+            link_button("Documentation", "https://binarygoose.dev/projects/clrsync/overview/", button_width);
+        });
+
+        ImGui::Spacing();
+        ImGui::Spacing();
+        ImGui::Separator();
+        ImGui::Spacing();
+
+        ImGui::TextColored(subtitle_color, "MIT License");
+        ImGui::TextWrapped(
+            "Copyright (c) 2025 Daniel Dada\n\n"
+            "Permission is hereby granted, free of charge, to any person obtaining a copy "
+            "of this software and associated documentation files (the \"Software\"), to deal "
+            "in the Software without restriction, including without limitation the rights "
+            "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell "
+            "copies of the Software, and to permit persons to whom the Software is "
+            "furnished to do so, subject to the following conditions:\n\n"
+            "The above copyright notice and this permission notice shall be included in all "
+            "copies or substantial portions of the Software.");
+    }
+    ImGui::End();
+}
--- a/src/gui/views/about_window.hpp
+++ b/src/gui/views/about_window.hpp
@@ -0,0 +1,33 @@
+#ifndef CLRSYNC_GUI_ABOUT_WINDOW_HPP
+#define CLRSYNC_GUI_ABOUT_WINDOW_HPP
+
+#include "core/palette/palette.hpp"
+
+class about_window
+{
+  public:
+    about_window();
+    void render(const clrsync::core::palette &pal);
+    void render()
+    {
+        render(m_default_palette);
+    }
+    void show()
+    {
+        m_visible = true;
+    }
+    void hide()
+    {
+        m_visible = false;
+    }
+    bool is_visible() const
+    {
+        return m_visible;
+    }
+
+  private:
+    bool m_visible{false};
+    clrsync::core::palette m_default_palette;
+};
+
+#endif // CLRSYNC_GUI_ABOUT_WINDOW_HPP
--- a/src/gui/views/color_scheme_editor.cpp
+++ b/src/gui/views/color_scheme_editor.cpp
@@ -0,0 +1,151 @@
+#include "color_scheme_editor.hpp"
+#include "gui/controllers/theme_applier.hpp"
+#include "gui/widgets/dialogs.hpp"
+#include "gui/widgets/palette_selector.hpp"
+#include "gui/widgets/input_dialog.hpp"
+#include "gui/widgets/action_buttons.hpp"
+#include "imgui.h"
+#include "settings_window.hpp"
+#include "template_editor.hpp"
+#include <iostream>
+
+color_scheme_editor::color_scheme_editor()
+{
+    const auto &current = m_controller.current_palette();
+
+    if (!current.colors().empty())
+    {
+        theme_applier::apply_to_imgui(current);
+        m_preview.apply_palette(current);
+    }
+    else
+    {
+        std::cout << "WARNING: No palette loaded, skipping theme application\n";
+    }
+    
+    setup_widgets();
+}
+
+void color_scheme_editor::notify_palette_changed()
+{
+    if (m_template_editor)
+    {
+        m_template_editor->apply_current_palette(m_controller.current_palette());
+    }
+    if (m_settings_window)
+    {
+        m_settings_window->set_palette(m_controller.current_palette());
+    }
+}
+
+void color_scheme_editor::apply_themes()
+{
+    const auto &current = m_controller.current_palette();
+    theme_applier::apply_to_imgui(current);
+    m_preview.apply_palette(current);
+    notify_palette_changed();
+}
+
+void color_scheme_editor::render_controls_and_colors()
+{
+    ImGui::Begin("Color Schemes");
+
+    render_controls();
+    ImGui::Separator();
+
+    ImGui::BeginChild("ColorTableContent", ImVec2(0, 0), false);
+    m_color_table.render(m_controller.current_palette(), m_controller,
+                         [this]() { apply_themes(); });
+    ImGui::EndChild();
+
+    ImGui::End();
+}
+
+void color_scheme_editor::render_preview()
+{
+    ImGui::Begin("Color Preview");
+
+    m_preview.render(m_controller.current_palette());
+
+    ImGui::End();
+}
+
+void color_scheme_editor::render_controls()
+{
+    const auto &current = m_controller.current_palette();
+    const auto &palettes = m_controller.palettes();
+
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(6, 8));
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8, 5));
+
+    ImGui::AlignTextToFramePadding();
+    ImGui::Text("Palette:");
+    ImGui::SameLine();
+
+    m_palette_selector.render(m_controller, 200.0f);
+
+    ImGui::SameLine();
+    ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 8);
+
+    if (ImGui::Button(" + New "))
+    {
+        m_new_palette_dialog.open("New Palette", "Enter a name for the new palette:", "Palette name...");
+    }
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Create a new palette");
+
+    m_new_palette_dialog.render();
+
+    ImGui::SameLine();
+    m_action_buttons.render(current);
+
+    if (m_show_delete_confirmation)
+    {
+        ImGui::OpenPopup("Delete Palette?");
+        m_show_delete_confirmation = false;
+    }
+
+    clrsync::gui::widgets::delete_confirmation_dialog("Delete Palette?", current.name(), "palette",
+                                                    current, [this]() {
+                                                        m_controller.delete_current_palette();
+                                                        apply_themes();
+                                                    });
+
+    ImGui::PopStyleVar(2);
+}
+
+void color_scheme_editor::setup_widgets()
+{
+    m_palette_selector.set_on_selection_changed([this](const std::string &name) {
+        m_controller.select_palette(name);
+        apply_themes();
+    });
+    
+    m_new_palette_dialog.set_on_submit([this](const std::string &name) {
+        m_controller.create_palette(name);
+        m_controller.select_palette(name);
+        apply_themes();
+    });
+    
+    m_action_buttons.add_button({
+        " Save ",
+        "Save current palette to file",
+        [this]() { m_controller.save_current_palette(); }
+    });
+    
+    m_action_buttons.add_button({
+        " Delete ",
+        "Delete current palette",
+        [this]() { m_show_delete_confirmation = true; },
+        true,
+        true
+    });
+    
+    m_action_buttons.add_button({
+        " Apply Theme ",
+        "Apply current palette to all enabled templates",
+        [this]() { m_controller.apply_current_theme(); }
+    });
+    
+    m_action_buttons.set_spacing(16.0f);
+}
--- a/src/gui/views/color_scheme_editor.hpp
+++ b/src/gui/views/color_scheme_editor.hpp
@@ -0,0 +1,52 @@
+#ifndef CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
+#define CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
+
+#include "gui/controllers/palette_controller.hpp"
+#include "gui/views/color_table_renderer.hpp"
+#include "gui/views/preview_renderer.hpp"
+#include "gui/widgets/palette_selector.hpp"
+#include "gui/widgets/input_dialog.hpp"
+#include "gui/widgets/action_buttons.hpp"
+
+class template_editor;
+class settings_window;
+
+class color_scheme_editor
+{
+  public:
+    color_scheme_editor();
+
+    void render_controls_and_colors();
+    void render_preview();
+    void set_template_editor(template_editor *editor)
+    {
+        m_template_editor = editor;
+    }
+    void set_settings_window(settings_window *window)
+    {
+        m_settings_window = window;
+    }
+    const palette_controller &controller() const
+    {
+        return m_controller;
+    }
+
+  private:
+    void render_controls();
+    void apply_themes();
+    void notify_palette_changed();
+    void setup_widgets();
+
+    palette_controller m_controller;
+    color_table_renderer m_color_table;
+    preview_renderer m_preview;
+    template_editor *m_template_editor{nullptr};
+    settings_window *m_settings_window{nullptr};
+    bool m_show_delete_confirmation{false};
+    
+    clrsync::gui::widgets::palette_selector m_palette_selector;
+    clrsync::gui::widgets::input_dialog m_new_palette_dialog;
+    clrsync::gui::widgets::action_buttons m_action_buttons;
+};
+
+#endif // CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
--- a/src/gui/views/color_table_renderer.cpp
+++ b/src/gui/views/color_table_renderer.cpp
@@ -1,5 +1,5 @@
-#include "color_table_renderer.hpp"
-#include "imgui_helpers.hpp"
+#include "gui/views/color_table_renderer.hpp"
+#include "gui/widgets/colors.hpp"
 #include "imgui.h"
 #include <algorithm>
 #include <cctype>
@@ -36,7 +36,7 @@ void color_table_renderer::render_color_row(const std::string &name,
    ImGui::TableSetColumnIndex(0);
    const float key_col_width = ImGui::GetContentRegionAvail().x;

-    ImVec4 text_color = palette_utils::get_color(current, "info", "accent");
+    ImVec4 text_color = clrsync::gui::widgets::palette_color(current, "info", "accent");
    ImGui::PushStyleColor(ImGuiCol_Text, text_color);
    const bool copied = ImGui::Selectable(name.c_str(), false, 0, ImVec2(key_col_width, 0.0f));
    ImGui::PopStyleColor();
@@ -107,18 +107,22 @@ void color_table_renderer::render(const clrsync::core::palette& current,
 {
    if (current.colors().empty())
    {
-        ImVec4 warning_color = palette_utils::get_color(current, "warning", "accent");
+        ImVec4 warning_color = clrsync::gui::widgets::palette_color(current, "warning", "accent");
        ImGui::TextColored(warning_color, "No palette loaded");
        return;
    }

    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8, 6));

+    ImGui::AlignTextToFramePadding();
    ImGui::Text("Filter:");
    ImGui::SameLine();
    ImGui::SetNextItemWidth(200);
-    bool filter_changed = ImGui::InputTextWithHint("##color_filter", "Search colors...", 
-                                                    m_filter_text, sizeof(m_filter_text));
+    bool filter_changed =
+        ImGui::InputTextWithHint("##color_filter",
+                                "Search colors...",
+                                m_filter_text,
+                                sizeof(m_filter_text));

    if (m_filter_text[0] != '\0')
    {
@@ -138,7 +142,8 @@ void color_table_renderer::render(const clrsync::core::palette& current,
    ImGui::Separator();
    ImGui::Spacing();

-    auto draw_table = [&](const char *title, const char* id, const std::vector<const char *> &keys) {
+    auto draw_table = [&](const char *title, const char *id,
+                          const std::vector<const char *> &keys) {
        bool has_matches = false;
        for (auto *k : keys)
        {
@@ -152,14 +157,16 @@ void color_table_renderer::render(const clrsync::core::palette& current,
        if (!has_matches)
            return;

-        ImGui::PushStyleColor(ImGuiCol_Text, palette_utils::get_color(current, "accent"));
-        bool header_open = ImGui::TreeNodeEx(title, ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_SpanAvailWidth);
+        ImGui::PushStyleColor(ImGuiCol_Text, clrsync::gui::widgets::palette_color(current, "accent"));
+        bool header_open = ImGui::TreeNodeEx(title, ImGuiTreeNodeFlags_DefaultOpen |
+                                                        ImGuiTreeNodeFlags_SpanAvailWidth);
        ImGui::PopStyleColor();

        if (header_open)
        {
            if (ImGui::BeginTable(id, 3,
-                ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingStretchProp))
+                                  ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg |
+                                      ImGuiTableFlags_SizingStretchProp))
            {
                ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 160.0f);
                ImGui::TableSetupColumn("HEX", ImGuiTableColumnFlags_WidthFixed, 95.0f);
@@ -177,23 +184,23 @@ void color_table_renderer::render(const clrsync::core::palette& current,
        ImGui::Spacing();
    };

-    draw_table("General UI", "##general_ui", {"background", "on_background", "surface", "on_surface",
-                              "surface_variant", "on_surface_variant", "foreground",
-                              "cursor", "accent"});
+    draw_table("General UI", "##general_ui",
+               {"background", "on_background", "surface", "on_surface", "surface_variant",
+                "on_surface_variant", "foreground", "cursor", "accent"});

    draw_table("Borders", "##borders", {"border_focused", "border"});

-    draw_table("Semantic Colors", "##semantic", {"success", "info", "warning", "error",
-                                   "on_success", "on_info", "on_warning", "on_error"});
+    draw_table(
+        "Semantic Colors", "##semantic",
+        {"success", "info", "warning", "error", "on_success", "on_info", "on_warning", "on_error"});

-    draw_table("Editor", "##editor", {"editor_background", "editor_command", "editor_comment",
-                          "editor_disabled", "editor_emphasis", "editor_error",
-                          "editor_inactive", "editor_line_number", "editor_link",
-                          "editor_main", "editor_selected", "editor_selection_inactive",
+    draw_table("Editor", "##editor",
+               {"editor_background", "editor_command", "editor_comment", "editor_disabled",
+                "editor_emphasis", "editor_error", "editor_inactive", "editor_line_number",
+                "editor_link", "editor_main", "editor_selected", "editor_selection_inactive",
                "editor_string", "editor_success", "editor_warning"});

-    draw_table("Terminal (Base16)", "##terminal", {"base00", "base01", "base02", "base03",
-                                     "base04", "base05", "base06", "base07",
-                                     "base08", "base09", "base0A", "base0B",
-                                     "base0C", "base0D", "base0E", "base0F"});
+    draw_table("Terminal (Base16)", "##terminal",
+               {"base00", "base01", "base02", "base03", "base04", "base05", "base06", "base07",
+                "base08", "base09", "base0A", "base0B", "base0C", "base0D", "base0E", "base0F"});
 }
--- a/src/gui/views/color_table_renderer.hpp
+++ b/src/gui/views/color_table_renderer.hpp
@@ -0,0 +1,27 @@
+#ifndef CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
+#define CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
+
+#include "core/palette/palette.hpp"
+#include "gui/controllers/palette_controller.hpp"
+#include <functional>
+#include <string>
+
+class color_table_renderer
+{
+  public:
+    using OnColorChangedCallback = std::function<void()>;
+
+    void render(const clrsync::core::palette &palette, palette_controller &controller,
+                const OnColorChangedCallback &on_changed);
+
+  private:
+    void render_color_row(const std::string &name, const clrsync::core::palette &palette,
+                          palette_controller &controller, const OnColorChangedCallback &on_changed);
+
+    bool matches_filter(const std::string &name) const;
+
+    char m_filter_text[128] = {0};
+    bool m_show_only_modified{false};
+};
+
+#endif // CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
--- a/src/gui/views/preview_renderer.cpp
+++ b/src/gui/views/preview_renderer.cpp
@@ -1,6 +1,6 @@
-#include "preview_renderer.hpp"
-#include "theme_applier.hpp"
-#include "imgui_helpers.hpp"
+#include "gui/views/preview_renderer.hpp"
+#include "gui/controllers/theme_applier.hpp"
+#include "gui/widgets/colors.hpp"
 #include "imgui.h"
 #include <algorithm>
 #include <array>
@@ -74,12 +74,8 @@ int main()

 static ImVec4 hex_to_imvec4(uint32_t hex)
 {
-    return {
-        ((hex >> 24) & 0xFF) / 255.0f,
-        ((hex >> 16) & 0xFF) / 255.0f,
-        ((hex >> 8) & 0xFF) / 255.0f,
-        (hex & 0xFF) / 255.0f
-    };
+    return {((hex >> 24) & 0xFF) / 255.0f, ((hex >> 16) & 0xFF) / 255.0f,
+            ((hex >> 8) & 0xFF) / 255.0f, (hex & 0xFF) / 255.0f};
 }

 void preview_renderer::apply_palette(const clrsync::core::palette &palette)
@@ -218,11 +214,13 @@ void preview_renderer::render_terminal_preview(const clrsync::core::palette& cur
        draw_list->AddRect(p0, p1, ImGui::ColorConvertFloat4ToU32(border_col));
    }

-    std::array<ImVec4, 8> bright_colors = {bright_black, bright_red, bright_green, bright_yellow, 
-                                            bright_blue, bright_magenta, bright_cyan, bright_white};
+    std::array<ImVec4, 8> bright_colors = {bright_black,  bright_red,  bright_green,
+                                           bright_yellow, bright_blue, bright_magenta,
+                                           bright_cyan,   bright_white};
    for (size_t i = 0; i < 8; i++)
    {
-        ImVec2 p0 = ImVec2(start_pos.x + i * (box_size + spacing), start_pos.y + box_size + spacing);
+        ImVec2 p0 =
+            ImVec2(start_pos.x + i * (box_size + spacing), start_pos.y + box_size + spacing);
        ImVec2 p1 = ImVec2(p0.x + box_size, p0.y + box_size);
        draw_list->AddRectFilled(p0, p1, ImGui::ColorConvertFloat4ToU32(bright_colors[i]));
        draw_list->AddRect(p0, p1, ImGui::ColorConvertFloat4ToU32(border_col));
@@ -238,7 +236,7 @@ void preview_renderer::render(const clrsync::core::palette& current)
 {
    if (current.colors().empty())
    {
-        ImVec4 error_color = palette_utils::get_color(current, "error", "accent");
+        ImVec4 error_color = clrsync::gui::widgets::palette_color(current, "error", "accent");
        ImGui::TextColored(error_color, "Current palette is empty");
        return;
    }
--- a/src/gui/views/preview_renderer.hpp
+++ b/src/gui/views/preview_renderer.hpp
@@ -1,8 +1,8 @@
 #ifndef CLRSYNC_GUI_PREVIEW_RENDERER_HPP
 #define CLRSYNC_GUI_PREVIEW_RENDERER_HPP

-#include "core/palette/palette.hpp"
 #include "color_text_edit/TextEditor.h"
+#include "core/palette/palette.hpp"

 class preview_renderer
 {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Dada	2b1c6d59c4	fix: brief freezes after file dialogs / fontconfig methods are used	2026-01-12 23:52:33 +03:00
Daniel Dada	d852d58948	tested and fixed new templates	2026-01-12 20:31:02 +03:00
Daniel Dada	41939f4df4	fixed hyprland and kvantum configs	2026-01-12 19:18:25 +03:00
Daniel Dada	a813b7f6c9	bump version	2026-01-12 14:45:10 +03:00
Daniel Dada	9803f4948b	fix: run reload command detached	2026-01-12 14:39:00 +03:00
Daniel Dada	c17960d1e6	untested: added gtk, hyprland, qtct and kvantum templates	2026-01-12 14:30:40 +03:00
Daniel Dada	19291f35ee	added telegram template	2026-01-12 14:00:47 +03:00
Daniel Dada	4d61ed3194	added firefox template	2026-01-12 13:13:08 +03:00
Daniel Dada	d722499e80	fixed borders in vscode template	2026-01-12 11:04:23 +03:00
Daniel Dada	e3cd9cd362	added vscode template	2026-01-12 10:50:51 +03:00
Daniel Dada	e256dcad2e	added some palettes and templates	2026-01-03 03:55:36 +03:00
Daniel Dada	5b0599a958	changed default kitty config location	2025-12-21 23:39:31 +03:00
Daniel Dada	afa7275e37	Update README.md	2025-12-20 00:23:34 +03:00
Daniel Dada	fc5663839e	Update README.md	2025-12-20 00:11:15 +03:00
Daniel Dada	997e7c3eae	add pkgbuild	2025-12-19 23:36:21 +03:00
Daniel Dada	4229db457c	merged dev	2025-12-19 23:32:17 +03:00
Daniel Dada	d17776b8e4	fix: minor ui fixes	2025-12-19 20:04:30 +03:00
Daniel Dada	8112096647	chore :refactored remaining views	2025-12-19 17:37:42 +03:00
Daniel Dada	4ada2c44ed	chore: refactor	2025-12-19 17:22:23 +03:00
Daniel Dada	82998d688c	build: write .clangd with proper compile_commands path on configure	2025-12-19 10:33:14 +03:00
Daniel Dada	6ac9c03ec4	fixed linux deps	2025-12-19 10:11:13 +03:00
Daniel Dada	2a433483d7	Merge branch 'master' into dev	2025-12-19 09:56:18 +03:00
Daniel Dada	ece7c84371	added cmake presets	2025-12-19 09:55:29 +03:00
Daniel Dada	5b641cdd02	fix: typo in font_loader.windows	2025-12-19 08:21:37 +03:00
Daniel Dada	dff3e916fe	bump version	2025-12-19 00:23:02 +03:00
Daniel Dada	2d653834a5	fix(nixos): write to config.temp.toml if config.toml is unwriteable	2025-12-19 00:19:26 +03:00
Daniel Dada	9be0a159ea	fixed limux build	2025-12-18 23:53:06 +03:00
Daniel Dada	0288773ccb	revert removed deps	2025-12-18 23:33:04 +03:00
Daniel Dada	c68ca3dabe	wip: moving backend-related stuff out of the app logic	2025-12-18 16:45:49 +03:00
Daniel Dada	292a748ac4	chore: minor adjustments	2025-12-18 14:57:15 +03:00
Daniel Dada	7641846600	chore: structured src/gui, run clang-format	2025-12-18 13:23:50 +03:00
@@ -1 +1 @@
 .1.6
 .0.4