chore: fixed build deps

.envrc

@@ -0,0 +1 @@
+use flake .

.github/workflows/Test PKGBUILD-git.yml

@@ -0,0 +1,45 @@
+name: Test PKGBUILD-git
+
+on:
+  push:
+    branch: master
+  pull_request:
+    branches: master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: archlinux:latest
+    
+    steps:
+    - name: Setup Arch
+      run: |
+        pacman -Sy --noconfirm --needed base-devel git sudo
+        useradd -m builder
+        echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+    
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    
+    - name: Set permissions
+      run: chown -R builder:builder .
+    
+    - name: Build
+      run: |
+        sudo -u builder bash -c '
+          cd AUR
+          makepkg -p PKGBUILD-git -si --noconfirm
+        '
+    
+    - name: Test
+      run: |
+        clrsync_cli --help
+        pacman -Ql clrsync-git
+    
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: clrsync-git
+        path: AUR/*.pkg.tar.zst

.github/workflows/Test flake.yml

@@ -0,0 +1,33 @@
+name: Test flake.nix
+
+on:
+  push:
+    branches: master
+  pull_request:
+    branches: master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v31
+        with:
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+
+      - name: Build clrsync package
+        run: |
+          nix --extra-experimental-features "flakes nix-command" build .#packages.x86_64-linux.clrsync
+
+      - name: Enter devShell
+        run: |
+          nix --extra-experimental-features "flakes nix-command" develop .#default --command true
+
+      - name: Test clrsync CLI
+        run: |
+          nix --extra-experimental-features "flakes nix-command" run .#clrsync-cli -- --help

.github/workflows/publish-release.yml

@@ -0,0 +1,139 @@
+name: Build and Release Packages
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-windows:
+    runs-on: windows-latest
+    outputs:
+      artifact-path: ${{ steps.upload.outputs.artifact-path }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install NSIS
+        run: choco install nsis --no-progress -y
+
+      - name: Setup MSVC
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Configure project
+        run: cmake -B build -S . -A x64
+
+      - name: Build project
+        run: cmake --build build --config Release
+
+      - name: Generate NSIS installer
+        run: cd build && cpack -G NSIS
+
+      - name: Upload installer
+        id: upload
+        uses: actions/upload-artifact@v6
+        with:
+          name: windows-installer
+          path: build/*.exe
+
+  build-ubuntu:
+    runs-on: ubuntu-latest
+    outputs:
+      artifact-path: ${{ steps.upload.outputs.artifact-path }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake build-essential git \
+            libglfw3-dev libfreetype6-dev libfontconfig1-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
+
+      - name: Configure CMake
+        run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_GLFW=OFF
+
+      - name: Build
+        run: cmake --build build --config Release
+
+      - name: Package DEB
+        run: cd build && cpack -G DEB
+
+      - name: Upload DEB
+        id: upload
+        uses: actions/upload-artifact@v6
+        with:
+          name: deb-package
+          path: build/*.deb
+
+  build-fedora:
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:latest
+    outputs:
+      artifact-path: ${{ steps.upload.outputs.artifact-path }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install dependencies
+        run: |
+          dnf install -y cmake gcc gcc-c++ make rpm-build git \
+            glfw-devel freetype-devel fontconfig-devel \
+            libX11-devel libXrandr-devel libXi-devel \
+            mesa-libGL-devel mesa-libGLU-devel \
+            libXinerama-devel libXcursor-devel \
+            wayland-devel wayland-protocols-devel gtk3-devel
+
+      - name: Configure CMake
+        run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_GLFW=ON
+
+      - name: Build
+        run: cmake --build build --config Release
+
+      - name: Package RPM
+        run: cd build && cpack -G RPM
+
+      - name: Upload RPM
+        id: upload
+        uses: actions/upload-artifact@v6
+        with:
+          name: rpm-package
+          path: build/*.rpm
+
+  release:
+    needs: [build-windows, build-ubuntu, build-fedora]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Download Windows artifact
+        uses: actions/download-artifact@v6
+        with:
+          name: windows-installer
+          path: artifacts/
+
+      - name: Download DEB artifact
+        uses: actions/download-artifact@v6
+        with:
+          name: deb-package
+          path: artifacts/
+
+      - name: Download RPM artifact
+        uses: actions/download-artifact@v6
+        with:
+          name: rpm-package
+          path: artifacts/
+
+      - name: Create Release and Upload Assets
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ github.ref_name }}
+          name: Release ${{ github.ref_name }}
+          artifacts: |
+            artifacts/*.exe
+            artifacts/*.deb
+            artifacts/*.rpm

.gitignore

@@ -3,8 +3,20 @@
 .vs
 out
 
-/build
-/build-*
+build/
+CMakeCache.txt
+CMakeFiles/
+cmake_install.cmake
+Makefile
+*.cmake
+
+AUR/clrsync-git
+AUR/pkg
+AUR/src
+
+result
+result-*
+.direnv/
 
 *.log
 *tar.zst
@@ -14,3 +26,12 @@ out
 *.bak
 *.tmp
 .DS_Store
+
+*.swp
+*.swo
+*~
+
+*.o
+*.a
+*.so
+*.dylib

AUR/PKGBUILD

@@ -1,24 +1,35 @@
 # Maintainer: Daniel Dada <dan@binarygoose.dev>
 pkgname=clrsync
-pkgver=0.1.3
+pkgver=0.1.5
 pkgrel=1
 pkgdesc="Color scheme manager"
 arch=('x86_64')
 url="https://github.com/obsqrbtz/clrsync"
 license=('MIT')
+
 depends=(
-    glfw-x11
+    glfw
     freetype2
     fontconfig
+    mesa
+    libglvnd
+    libxcursor
+    gtk3
+)
+
+makedepends=(
+  cmake
+  glfw
   libx11
   libxrandr
   libxi
-    mesa
-    libglvnd
   libxinerama
   libxcursor
+  wayland
+  wayland-protocols
+  gtk3
 )
-makedepends=('cmake')
+
 source=("$pkgname-$pkgver.tar.gz::https://github.com/obsqrbtz/clrsync/archive/refs/tags/v$pkgver.tar.gz")
 sha256sums=('SKIP')
 
@@ -26,6 +37,7 @@ build() {
     cd "$pkgname-$pkgver"
     cmake -B build -S . \
         -DCMAKE_BUILD_TYPE=Release \
+        -DUSE_SYSTEM_GLFW=ON \
         -DCMAKE_INSTALL_PREFIX=/usr
     cmake --build build
 }
@@ -33,5 +45,5 @@ build() {
 package() {
     cd "$pkgname-$pkgver"
     DESTDIR="$pkgdir" cmake --install build
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

AUR/PKGBUILD-git

@@ -0,0 +1,55 @@
+# Maintainer: Daniel Dada <dan@binarygoose.dev>
+pkgname=clrsync-git
+pkgver=r22.d8baae2
+pkgrel=1
+pkgdesc="Color scheme manager (git version)"
+arch=('x86_64')
+url="https://github.com/obsqrbtz/clrsync"
+license=('MIT')
+depends=(
+    glfw
+    freetype2
+    fontconfig
+    mesa
+    libglvnd
+    libxcursor
+    gtk3
+)
+
+makedepends=(
+  cmake
+  git
+  glfw
+  libx11
+  libxrandr
+  libxi
+  libxinerama
+  libxcursor
+  wayland
+  wayland-protocols
+  gtk3
+)
+provides=('clrsync')
+conflicts=('clrsync')
+source=("$pkgname::git+https://github.com/obsqrbtz/clrsync.git")
+sha256sums=('SKIP')
+
+pkgver() {
+    cd "$srcdir/$pkgname"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+build() {
+    cd "$srcdir/$pkgname"
+    cmake -B build -S . \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DUSE_SYSTEM_GLFW=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr
+    cmake --build build
+}
+
+package() {
+    cd "$srcdir/$pkgname"
+    DESTDIR="$pkgdir" cmake --install build
+    install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

AUR/PKGBUILD.in

@@ -6,19 +6,30 @@ pkgdesc="Color scheme manager"
 arch=('x86_64')
 url="https://github.com/obsqrbtz/clrsync"
 license=('MIT')
+
 depends=(
-    glfw-x11
+    glfw
     freetype2
     fontconfig
+    mesa
+    libglvnd
+    libxcursor
+    gtk3
+)
+
+makedepends=(
+  cmake
+  glfw
   libx11
   libxrandr
   libxi
-    mesa
-    libglvnd
   libxinerama
   libxcursor
+  wayland
+  wayland-protocols
+  gtk3
 )
-makedepends=('cmake')
+
 source=("$pkgname-$pkgver.tar.gz::https://github.com/obsqrbtz/clrsync/archive/refs/tags/v$pkgver.tar.gz")
 sha256sums=('SKIP')
 
@@ -26,6 +37,7 @@ build() {
     cd "$pkgname-$pkgver"
     cmake -B build -S . \
         -DCMAKE_BUILD_TYPE=Release \
+        -DUSE_SYSTEM_GLFW=ON \
         -DCMAKE_INSTALL_PREFIX=/usr
     cmake --build build
 }
@@ -33,5 +45,5 @@ build() {
 package() {
     cd "$pkgname-$pkgver"
     DESTDIR="$pkgdir" cmake --install build
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

CMakeLists.txt

@@ -1,11 +1,18 @@
 cmake_minimum_required(VERSION 3.25)
-project(clrsync VERSION 0.1.3 LANGUAGES CXX)
+project(clrsync VERSION 0.1.5 LANGUAGES CXX)
 
 include(GNUInstallDirs)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+option(USE_SYSTEM_GLFW "Use system-installed GLFW instead of fetching it statically" OFF)
+message(STATUS "USE_SYSTEM_GLFW: ${USE_SYSTEM_GLFW}")
+
 if(WIN32)
     set(CMAKE_INSTALL_PREFIX "C:/Program Files/clrsync")
     set(CMAKE_INSTALL_BINDIR "bin")
@@ -19,6 +26,36 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
 
+if(DEFINED CLRSYNC_SEMVER)
+  set(SEMVER "${CLRSYNC_SEMVER}")
+else()
+  find_package(Git QUIET)
+
+    if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    execute_process(
+        COMMAND git describe --tags --long --always
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_DESCRIBE
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+    )
+    endif()
+
+    if(GIT_DESCRIBE MATCHES "^[vV]?[0-9]+\\.[0-9]+\\.[0-9]+-[0-9]+-g[0-9a-f]+")
+    string(REGEX REPLACE
+        "^[vV]?([0-9]+\\.[0-9]+\\.[0-9]+)-([0-9]+)-g([0-9a-f]+)"
+        "\\1+git.g\\3"
+        SEMVER "${GIT_DESCRIBE}"
+    )
+    elseif(GIT_DESCRIBE)
+    set(SEMVER "${PROJECT_VERSION}.git.${GIT_DESCRIBE}")
+    else()
+    set(SEMVER "${PROJECT_VERSION}")
+    endif()
+endif()
+
+message(STATUS "clrsync version: ${SEMVER}")
+
 configure_file(
     ${CMAKE_SOURCE_DIR}/src/core/version.hpp.in
     ${CMAKE_SOURCE_DIR}/src/core/version.hpp
@@ -26,195 +63,30 @@ configure_file(
 )
 
 configure_file(
-    ${CMAKE_SOURCE_DIR}/PKGBUILD.in
-    ${CMAKE_SOURCE_DIR}/PKGBUILD
+    ${CMAKE_SOURCE_DIR}/VERSION.in
+    ${CMAKE_SOURCE_DIR}/VERSION
     @ONLY
 )
 
-find_package(OpenGL REQUIRED)
-
-if(WIN32)
-    include(FetchContent)
-    FetchContent_Declare(
-        freetype
-        URL https://download.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.gz
-    )
-    FetchContent_MakeAvailable(freetype)
-
-    FetchContent_Declare(
-        glfw
-        GIT_REPOSITORY https://github.com/glfw/glfw.git
-        GIT_TAG 3.3.10
-    )
-	
-    set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-    set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
-
-    FetchContent_MakeAvailable(glfw)
-
-else()
-    find_package(Freetype REQUIRED)
-    find_package(PkgConfig REQUIRED)
-    find_package(Fontconfig REQUIRED)
-    pkg_check_modules(GLFW REQUIRED glfw3)
-endif()
-
-set(CORE_SOURCES
-    src/core/palette/color.cpp
-    src/core/io/toml_file.cpp
-    src/core/config/config.cpp
-    src/core/utils.cpp
-    src/core/version.cpp
-    src/core/theme/theme_template.cpp
+configure_file(
+    ${CMAKE_SOURCE_DIR}/AUR/PKGBUILD.in
+    ${CMAKE_SOURCE_DIR}/AUR/PKGBUILD
+    @ONLY
 )
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-add_library(clrsync_core SHARED ${CORE_SOURCES})
-target_include_directories(clrsync_core PUBLIC src SYSTEM lib)
-target_compile_definitions(clrsync_core PUBLIC
-    CLRSYNC_DATADIR=\"${CMAKE_INSTALL_FULL_DATADIR}/clrsync\"
-)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+include(Dependencies)
+include(ImGui)
 
-add_executable(clrsync_cli src/cli/main.cpp)
-target_include_directories(clrsync_cli PRIVATE src SYSTEM lib)
-target_link_libraries(clrsync_cli PRIVATE clrsync_core)
+add_subdirectory(src/core)
+add_subdirectory(src/cli)
+add_subdirectory(src/gui)
 
-set(GUI_SOURCES
-    src/gui/main.cpp
-    src/gui/color_scheme_editor.cpp
-    src/gui/template_editor.cpp
-    src/gui/palette_controller.cpp
-    src/gui/template_controller.cpp
-    lib/color_text_edit/TextEditor.cpp
-    src/gui/imgui_helpers.cpp
-    src/gui/imgui_helpers.hpp
-    src/gui/about_window.cpp
-    src/gui/settings_window.cpp
-    src/gui/font_loader.cpp
-)
-add_executable(clrsync_gui ${GUI_SOURCES})
-target_include_directories(clrsync_gui PRIVATE src SYSTEM lib)
-# if(WIN32)
-#     set_target_properties(clrsync_gui PROPERTIES
-#         LINK_FLAGS "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup"
-#     )
-# endif()
-
-if(WIN32)
-    target_link_libraries(clrsync_gui PRIVATE clrsync_core glfw freetype imgui OpenGL::GL)
-else()
-    target_include_directories(clrsync_gui PRIVATE ${FREETYPE_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS})
-    target_link_libraries(clrsync_gui PRIVATE clrsync_core imgui ${FREETYPE_LIBRARIES} ${GLFW_LIBRARIES} X11 Xrandr Xi Fontconfig::Fontconfig OpenGL::GL)
-endif()
-
-set(imgui_SOURCE_DIR lib/imgui)
-add_library(imgui STATIC
-    ${imgui_SOURCE_DIR}/imgui.cpp
-    ${imgui_SOURCE_DIR}/imgui_draw.cpp
-    ${imgui_SOURCE_DIR}/imgui_widgets.cpp
-    ${imgui_SOURCE_DIR}/imgui_tables.cpp
-    ${imgui_SOURCE_DIR}/backends/imgui_impl_glfw.cpp
-    ${imgui_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp
-    ${imgui_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp
-)
-
-target_include_directories(imgui PUBLIC SYSTEM
-    ${imgui_SOURCE_DIR}
-    ${imgui_SOURCE_DIR}/backends
-)
-
-if(WIN32)
-    target_include_directories(imgui PUBLIC ${GLFW_INCLUDE_DIRS} ${freetype_SOURCE_DIR}/include)
-else()
-    target_include_directories(imgui PUBLIC ${GLFW_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS})
-endif()
-
-target_link_libraries(imgui PUBLIC glfw OpenGL::GL freetype)
-target_compile_definitions(imgui PUBLIC IMGUI_ENABLE_FREETYPE)
-
-install(TARGETS clrsync_core
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        COMPONENT Core
-)
-
-install(TARGETS clrsync_cli
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        COMPONENT CLI
-)
-
-install(TARGETS clrsync_gui
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        COMPONENT GUI
-)
-
-install(FILES
-        example_config/config.toml
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/clrsync
-        COMPONENT Core
-)
-
-install(DIRECTORY example_config/templates
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/clrsync
-        COMPONENT Core
-        FILES_MATCHING PATTERN "*"
-)
-
-install(DIRECTORY example_config/palettes
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/clrsync
-        COMPONENT Core
-        FILES_MATCHING PATTERN "*.toml"
-)
-
-if(UNIX AND NOT APPLE)
-    install(FILES resources/clrsync.desktop
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
-        COMPONENT Core
-    )
-endif()
-
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
-set(CPACK_COMPONENTS_ALL Core GUI CLI)
-
-set(CPACK_PACKAGE_NAME "clrsync")
-set(CPACK_PACKAGE_VENDOR "Daniel Dada")
-set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Color scheme manager")
-
-set(CPACK_COMPONENTS_ALL Core GUI CLI)
-set(CPACK_COMPONENT_CORE_DISPLAY_NAME "Core Library")
-set(CPACK_COMPONENT_CORE_DESCRIPTION "clrsync core library and default configs (required)")
-set(CPACK_COMPONENT_CORE_REQUIRED ON)
-set(CPACK_COMPONENT_GUI_DISPLAY_NAME "GUI Application")
-set(CPACK_COMPONENT_GUI_DESCRIPTION "clrsync GUI app")
-set(CPACK_COMPONENT_GUI_DEPENDS Core)
-set(CPACK_COMPONENT_CLI_DISPLAY_NAME "Command Line Tool")
-set(CPACK_COMPONENT_CLI_DESCRIPTION "clrsync CLI app")
-set(CPACK_COMPONENT_CLI_DEPENDS Core)
-
-set(CPACK_GENERATOR "NSIS;DEB;RPM")
-
-set(CPACK_NSIS_INSTALLED_NAME "clrsync")
-set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
-
-set(CPACK_NSIS_MODIFY_PATH ON)
-set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
-
-set(CPACK_NSIS_MENU_LINKS "bin/clrsync_gui.exe" "clrsync")
-set(CPACK_NSIS_CREATE_DESKTOP_LINKS "bin/clrsync_gui.exe;clrsync")
-
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Daniel Dada <dan@binarygoose.dev>")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.31), libglfw3, libfreetype6")
-set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
-set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-
-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")
+include(Install)
+include(Packaging)
 
 message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
 message(STATUS "CMAKE_INSTALL_FULL_DATADIR: ${CMAKE_INSTALL_FULL_DATADIR}")
 
-include(CPack)
+message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "CMAKE_INSTALL_FULL_DATADIR: ${CMAKE_INSTALL_FULL_DATADIR}")

README.md

@@ -1,56 +1,271 @@
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Nix Flake](https://img.shields.io/badge/Nix-Flake-blue.svg)](https://nixos.wiki/wiki/Flakes)
+
 # clrsync
 
-A theme management tool for synchronizing color schemes across multiple applications. clrsync allows you to define color palettes once and apply them consistently to all your terminal emulators, editors, and other configurable applications.
+**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)
 
+## Table of Contents
+
+
+- [Features](#features)
+- [Installation](#installation)
+  - [Linux](#linux)
+    - [Ubuntu](#ubuntu)
+    - [Fedora](#fedora)
+    - [NixOS](#nixos)
+      - [Home Manager Module](#home-manager-module)
+      - [Package](#package)
+      - [Install to profile](#install-to-profile)
+      - [Run without installing](#run-without-installing)
+  - [Windows](#windows)
+  - [Other systems](#other-systems)
+- [Building](#building)
+  - [Prerequisites](#prerequisites)
+  - [With CMake](#with-cmake)
+- [Configuration](#configuration)
+  - [Palette Files](#palette-files)
+  - [Template Files](#template-files)
+    - [Color Format Specifiers](#color-format-specifiers)
+- [Usage](#usage)
+  - [CLI](#cli)
+  - [GUI](#gui)
+- [Acknowledgments](#acknowledgments)
+
 ## Features
 
 - **Unified Color Management**: Define color palettes in TOML format and apply them across multiple applications
 - **CLI & GUI**: Choose between a command-line interface or a graphical editor
 - **Live Reload**: Define post-apply hooks (configurable per template)
 - **Flexible Color Formats**: Support for HEX, RGB, HSL with multi-component access (e.g., `{color.r}`, `{color.hex}`, `{color.hsl}`)
-- **Pre-built Themes**: Includes popular themes
+
+## Installation
+
+### Linux
+
+#### Ubuntu
+
+1. Download the latest .deb from the [releases page](https://github.com/obsqrbtz/clrsync/releases)
+2. Install the package
+
+```shell
+sudo dpkg -i clrsync-<version>.deb
+```
+
+#### Fedora
+
+1. Download the latest .rpm from the [releases page](https://github.com/obsqrbtz/clrsync/releases)
+
+2. Install the package
+
+```shell
+sudo rpm -i clrsync-<version>.rpm
+
+# or
+
+sudo dnf install clrsync-<version>.rpm
+```
+
+#### NixOS
+
+<details>
+<summary>Home Manager Module</summary>
+
+1. Add clrsync to your flake inputs
+
+```nix
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    home-manager.url = "github:nix-community/home-manager";
+    
+    clrsync.url = "github:obsqrbtz/clrsync";
+  };
+}
+```
+
+2. Add clrsync to flake outputs
+
+```nix
+outputs =
+  {
+    self,
+    nixpkgs,
+    home-manager,
+    clrsync,
+    ...
+  }@inputs:
+  let
+    system = "x86_64-linux";
+    pkgs = nixpkgs.legacyPackages.${system};
+  in
+  {
+    # ...
+    homeConfigurations.<Your user name> = home-manager.lib.homeManagerConfiguration {
+      inherit pkgs;
+      extraSpecialArgs = { inherit inputs; };
+      modules = [
+        ./home.nix
+        clrsync.homeModules.default
+      ];
+    };
+  };
+```
+
+3. Configure in home manager
+
+```nix
+programs.clrsync = {
+  package = inputs.clrsync.packages.x86_64-linux.default;  
+  defaultTheme = "dark";
+  palettesPath = "~/.config/clrsync/palettes";
+  font = "JetBrainsMono Nerd Font Mono";
+  fontSize = 14;
+  applyTheme = true;
+
+  templates = {
+    kitty = {
+      enabled = true;
+      inputPath = "~/.config/clrsync/templates/kitty.conf";
+      outputPath = "~/.config/kitty/clrsync.conf";
+      reloadCmd = "pkill -SIGUSR1 kitty";
+    };
+    
+    rofi = {
+      enabled = true;
+      inputPath = "~/.config/clrsync/templates/rofi.rasi";
+      outputPath = "~/.config/rofi/clrsync.rasi";
+    };
+  };
+};
+```
+
+4. Rebuild
+
+```nix
+home-manager switch --flake .
+```
+
+</details>
+
+<details>
+<summary>Package</summary>
+
+1. Add clrsync to your flake inputs
+
+```nix
+{
+  inputs = {
+    clrsync.url = "github:obsqrbtz/clrsync";
+  };
+}
+```
+
+2. Install the package
+
+```nix
+# In NixOS configuration.nix:
+nixpkgs.overlays = [
+  inputs.clrsync.overlays.default
+];
+
+environment.systemPackages = [
+  clrsync
+];
+```
+
+Or for home manager:
+
+```nix
+# flake.nix
+pkgs = import nixpkgs {
+  inherit system;
+  overlays = [
+    clrsync.overlays.default
+  ];
+};
+```
+
+```nix
+# home.nix
+home.packages = [
+  clrsync
+];
+```
+
+3. Use the app manually
+
+```shell
+clrsync_gui
+
+# or
+clrsync_cli --apply --theme dark
+```
+
+</details>
+
+<details>
+<summary>Install to profile</summary>
+
+```shell
+nix profile add github:obsqrbtz/clrsync
+```
+
+</details>
+
+<details>
+<summary>Run without installing</summary>
+
+```shell
+nix run github:obsqrbtz/clrsync
+nix run github:obsqrbtz/clrsync#clrsync-cli
+```
+
+</details>
+
+### Windows
+
+1. Download the latest installer from the [releases page](https://github.com/obsqrbtz/clrsync/releases)
+2. Run the installer and follow the wizard
+3. Optionally, add the installation dir to your PATH for easier CLI access
+
+### Other systems
+
+Follow the steps from Building section then install with cmake:
+```bash
+cd build
+cmake --install .
+```
 
 ## Building
 
 ### Prerequisites
 
 - C++20 compatible compiler (GCC, Clang, or MSVC)
-- CMake or Meson
+- CMake
 - OpenGL
+- glfw
+- fontconfig
+- freetype
 
-### Using CMake
-
+### With CMake
 ```bash
 mkdir build && cd build
 cmake ..
 cmake --build .
 ```
 
-### Using Meson
-
-```bash
-meson setup builddir
-meson compile -C builddir
-```
-
-## Installation
-
-After building, you'll have:
-
-- `clrsync_cli` - CLI
-- `clrsync_gui` - GUI
-- `libclrsync_core` - Shared lib
-
 ## Configuration
 
-Create a configuration file at `~/.config/clrsync/config.toml`:
-
+Edit or create a configuration file at `~/.config/clrsync/config.toml`:
 ```toml
 [general]
 palettes_path = "~/.config/clrsync/palettes"
-default_theme = "dark"
+default_theme = "cursed"
 
 [templates.kitty]
 input_path = "~/.config/clrsync/templates/kitty.conf"
@@ -61,79 +276,109 @@ reload_cmd = "pkill -SIGUSR1 kitty"
 
 ### Palette Files
 
-Create palette files in your `palettes_path` directory:
+<details>
+<summary>Example palette file</summary>
 
+Create palette files in your `palettes_path` directory:
 ```toml
 # ~/.config/clrsync/palettes/dark.toml
 [general]
-name = "dark"
+name = 'cursed'
 
 [colors]
-background = "#111318FF"
-surface = "#1E1F25FF"
-surface_variant = "#282A2FFF"
-
-foreground = "#E2E2E9FF"
-foreground_secondary = "#A8ABB3FF"
-
-accent = "#00AA56FF"
-outline = "#44474FFF"
-shadow = "#00000080"
-cursor = "#FFFFFFFF"
-
-error = "#FF5F5FFF"
-warning = "#FFC966FF"
-success = "#6AD68BFF"
-info = "#5DB2FFFF"
-
-term_black   = "#111318FF"
-term_red     = "#FF5F5FFF"
-term_green   = "#00AA56FF"
-term_yellow  = "#FFC966FF"
-term_blue    = "#5DB2FFFF"
-term_magenta = "#DEBCDFFF"
-term_cyan    = "#86C9FFFF"
-term_white   = "#E2E2E9FF"
-
-term_black_bright   = "#33353AFF"
-term_red_bright     = "#FFB780FF"
-term_green_bright   = "#00CC6AFF"
-term_yellow_bright  = "#FFD580FF"
-term_blue_bright    = "#86C9FFFF"
-term_magenta_bright = "#F0D6F0FF"
-term_cyan_bright    = "#BFEFFFFF"
-term_white_bright   = "#FFFFFFFF"
+accent = '#B44242FF'
+background = '#151515FF'
+base00 = '#151515FF'
+base01 = '#B44242FF'
+base02 = '#95A328FF'
+base03 = '#E1C135FF'
+base04 = '#60928FFF'
+base05 = '#7C435AFF'
+base06 = '#A48B4AFF'
+base07 = '#C2C2B0FF'
+base08 = '#3F3639FF'
+base09 = '#DC7671FF'
+base0A = '#E8E85AFF'
+base0B = '#9E9052FF'
+base0C = '#76C39BFF'
+base0D = '#86596CFF'
+base0E = '#CEB34FFF'
+base0F = '#B0AFA8FF'
+border = '#3F3639FF'
+border_focused = '#E1C135FF'
+cursor = '#E1C135FF'
+editor_background = '#151515FF'
+editor_command = '#CEB34FFF'
+editor_comment = '#3F3639FF'
+editor_disabled = '#3F3639FF'
+editor_emphasis = '#DC7671FF'
+editor_error = '#B44242FF'
+editor_inactive = '#3F3639FF'
+editor_line_number = '#86596CFF'
+editor_link = '#60928FFF'
+editor_main = '#C2C2B0FF'
+editor_selected = '#3F3639FF'
+editor_selection_inactive = '#2A2A2AFF'
+editor_string = '#76C39BFF'
+editor_success = '#95A328FF'
+editor_warning = '#E1C135FF'
+error = '#B44242FF'
+foreground = '#C2C2B0FF'
+info = '#60928FFF'
+on_background = '#C2C2B0FF'
+on_error = '#151515FF'
+on_info = '#151515FF'
+on_success = '#151515FF'
+on_surface = '#C2C2B0FF'
+on_surface_variant = '#C2C2B0FF'
+on_warning = '#151515FF'
+success = '#95A328FF'
+surface = '#1C1C1CFF'
+surface_variant = '#1C1C1CFF'
+warning = '#E1C135FF'
 ```
 
+</details>
+
 ### Template Files
 
-Create template files using color variables with flexible format specifiers:
+<details>
+<summary>Example template file</summary>
 
+Create template files at `~/.config/clrsync/templates` using color variables:
 ```conf
 # ~/.config/clrsync/templates/kitty.conf
-cursor              {foreground}
+cursor              {cursor}
 cursor_text_color   {background}
-
 foreground            {foreground}
 background            {background}
-selection_foreground  {foreground_secondary}
+selection_foreground  {on_surface}
 selection_background  {surface}
 url_color             {accent}
-
-color0      {background}
-color1      {term_red}
-color2      {term_green}
-color3      {term_yellow}
-color4      {term_blue}
-color5      {term_magenta}
-color6      {term_cyan}
-color7      {term_white}
+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}
 ```
 
-#### Color Format Specifiers
+</details>
 
-Access color components using dot notation:
+<details>
+<summary>Color Format Specifiers</summary>
 
+Format colors using dot notation:
 ```conf
 # HEX formats
 {color}                    # Default: #RRGGBB
@@ -163,42 +408,38 @@ Access color components using dot notation:
 {color.a}                  # Alpha component
 ```
 
+</details>
+
 ## Usage
 
 ### CLI
 
 List available themes:
-
 ```bash
 clrsync_cli --list-themes
 ```
 
 Apply the default theme:
-
 ```bash
 clrsync_cli --apply
 ```
 
 Apply a specific theme:
-
 ```bash
-clrsync_cli --apply --theme rose-pine
+clrsync_cli --apply --theme cursed
 ```
 
 Apply a theme from a file path:
-
 ```bash
 clrsync_cli --apply --path /path/to/theme.toml
 ```
 
 Show available color variables:
-
 ```bash
 clrsync_cli --show-vars
 ```
 
 Use a custom config file:
-
 ```bash
 clrsync_cli --config /path/to/config.toml --apply
 ```
@@ -206,7 +447,6 @@ clrsync_cli --config /path/to/config.toml --apply
 ### GUI
 
 Launch the graphical editor:
-
 ```bash
 clrsync_gui
 ```
@@ -219,10 +459,10 @@ The GUI provides:
 
 ## Acknowledgments
 
-This project uses the following open-source libraries:
-
+- **[matugen](https://github.com/InioX/matugen)** - A material you color generation tool
 - **[Dear ImGui](https://github.com/ocornut/imgui)** - Bloat-free graphical user interface library for C++
 - **[GLFW](https://www.glfw.org/)** - Multi-platform library for OpenGL, OpenGL ES and Vulkan development
 - **[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

VERSION

@@ -0,0 +1 @@
+0.1.5

VERSION.in

@@ -0,0 +1 @@
+@PROJECT_VERSION@

cmake/Dependencies.cmake

@@ -0,0 +1,73 @@
+find_package(OpenGL REQUIRED)
+
+if(WIN32)
+    include(FetchContent)
+
+    FetchContent_Declare(
+        freetype
+        URL https://download.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.gz
+    )
+    FetchContent_MakeAvailable(freetype)
+else()
+    find_package(Freetype REQUIRED)
+    find_package(PkgConfig REQUIRED)
+    find_package(Fontconfig REQUIRED)
+    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)
+endif()
+
+if (LINUX)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+endif()
+
+if(USE_SYSTEM_GLFW)
+    pkg_check_modules(GLFW REQUIRED glfw3)
+else()
+    include(FetchContent)
+    FetchContent_Declare(
+        glfw
+        GIT_REPOSITORY https://github.com/glfw/glfw.git
+        GIT_TAG 3.4
+    )
+    set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+    set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
+    
+    FetchContent_MakeAvailable(glfw)
+    set(GLFW_FOUND TRUE)
+    set(GLFW_INCLUDE_DIRS ${glfw_SOURCE_DIR}/include)
+    set(GLFW_LIBRARIES glfw)
+endif()
+
+set(FREETYPE_EXTRA_LIBS "")
+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")
+endif()
+
+set(WAYLAND_LIBS "")
+if(WAYLAND_CLIENT_FOUND)
+    list(APPEND WAYLAND_LIBS ${WAYLAND_CLIENT_LIBRARIES})
+    message(STATUS "Found Wayland client")
+endif()
+if(WAYLAND_EGL_FOUND)
+    list(APPEND WAYLAND_LIBS ${WAYLAND_EGL_LIBRARIES})
+    message(STATUS "Found Wayland EGL")
+endif()
+

cmake/ImGui.cmake

@@ -0,0 +1,32 @@
+set(IMGUI_SOURCE_DIR ${CMAKE_SOURCE_DIR}/lib/imgui)
+
+add_library(imgui STATIC
+    ${IMGUI_SOURCE_DIR}/imgui.cpp
+    ${IMGUI_SOURCE_DIR}/imgui_draw.cpp
+    ${IMGUI_SOURCE_DIR}/imgui_widgets.cpp
+    ${IMGUI_SOURCE_DIR}/imgui_tables.cpp
+    ${IMGUI_SOURCE_DIR}/backends/imgui_impl_glfw.cpp
+    ${IMGUI_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp
+    ${IMGUI_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp
+)
+
+target_include_directories(imgui PUBLIC SYSTEM
+    ${IMGUI_SOURCE_DIR}
+    ${IMGUI_SOURCE_DIR}/backends
+)
+
+target_compile_definitions(imgui PUBLIC IMGUI_ENABLE_FREETYPE)
+
+if(WIN32)
+    target_include_directories(imgui PUBLIC ${GLFW_INCLUDE_DIRS} ${freetype_SOURCE_DIR}/include)
+    target_link_libraries(imgui PUBLIC freetype)
+else()
+    target_include_directories(imgui PUBLIC ${GLFW_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS})
+    target_link_libraries(imgui PRIVATE 
+        Freetype::Freetype 
+        ${FREETYPE_EXTRA_LIBS}
+        ZLIB::ZLIB 
+        BZip2::BZip2 
+        PNG::PNG
+    )
+endif()

cmake/Install.cmake

@@ -0,0 +1,39 @@
+install(TARGETS clrsync_core
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        COMPONENT Core
+)
+
+install(TARGETS clrsync_cli
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        COMPONENT CLI
+)
+
+install(TARGETS clrsync_gui
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        COMPONENT GUI
+)
+
+install(FILES example_config/config.toml
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/clrsync
+        COMPONENT Core
+)
+
+install(DIRECTORY example_config/templates
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/clrsync
+        COMPONENT Core
+        FILES_MATCHING PATTERN "*"
+)
+
+install(DIRECTORY example_config/palettes
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/clrsync
+        COMPONENT Core
+        FILES_MATCHING PATTERN "*.toml"
+)
+
+if(UNIX AND NOT APPLE)
+    install(FILES resources/clrsync.desktop
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
+        COMPONENT Core
+    )
+endif()

cmake/Packaging.cmake

@@ -0,0 +1,41 @@
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
+set(CPACK_PACKAGE_NAME "clrsync")
+set(CPACK_PACKAGE_VENDOR "Daniel Dada")
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Color scheme manager")
+set(CPACK_GENERATOR "NSIS;DEB;RPM")
+
+# Components
+set(CPACK_COMPONENTS_ALL Core GUI CLI)
+set(CPACK_COMPONENT_CORE_DISPLAY_NAME "Core Library")
+set(CPACK_COMPONENT_CORE_DESCRIPTION "clrsync core library and default configs (required)")
+set(CPACK_COMPONENT_CORE_REQUIRED ON)
+set(CPACK_COMPONENT_GUI_DISPLAY_NAME "GUI Application")
+set(CPACK_COMPONENT_GUI_DESCRIPTION "clrsync GUI app")
+set(CPACK_COMPONENT_GUI_DEPENDS Core)
+set(CPACK_COMPONENT_CLI_DISPLAY_NAME "Command Line Tool")
+set(CPACK_COMPONENT_CLI_DESCRIPTION "clrsync CLI app")
+set(CPACK_COMPONENT_CLI_DEPENDS Core)
+
+# NSIS
+set(CPACK_NSIS_INSTALLED_NAME "clrsync")
+set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
+set(CPACK_NSIS_MODIFY_PATH ON)
+set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+set(CPACK_NSIS_MENU_LINKS "bin/clrsync_gui.exe" "clrsync")
+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_SECTION "utils")
+set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
+
+# RPM
+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")
+
+include(CPack)

example_config/palettes/cursed-light.toml

@@ -7,7 +7,7 @@ surface = "#e8e8e8FF"
 on_surface = "#3d3d2fFF"
 
 surface_variant = "#d0d0c8FF"
-on_surface_varuant = "#3d3d2fFF"
+on_surface_variant = "#3d3d2fFF"
 
 border_focused = "#c9a305FF"
 border = "#d0d0c8FF"

example_config/palettes/cursed.toml

@@ -43,7 +43,7 @@ on_error = '#151515FF'
 on_info = '#151515FF'
 on_success = '#151515FF'
 on_surface = '#C2C2B0FF'
-on_surface_varuant = '#C2C2B0FF'
+on_surface_variant = '#C2C2B0FF'
 on_warning = '#151515FF'
 success = '#95A328FF'
 surface = '#1C1C1CFF'

example_config/templates/kitty.conf

@@ -7,34 +7,26 @@ selection_foreground  {on_surface}
 selection_background  {surface}
 url_color             {accent}
 
-# Base colors (dark variants)
 color0      {base00}
 color8      {base08}
 
-# Red
 color1      {base01}
 color9      {base09}
 
-# Green
 color2      {base02}
 color10     {base0A}
 
-# Yellow
 color3      {base03}
 color11     {base0B}
 
-# Blue
 color4      {base04}
 color12     {base0C}
 
-# Magenta
 color5      {base05}
 color13     {base0D}
 
-# Cyan
 color6      {base06}
 color14     {base0E}
 
-# White
 color7      {base07}
 color15     {base0F}

flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1764950072,
+        "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f61125a668a320878494449750330ca58b78c557",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,94 @@
+{
+  description = "clrsync - Color scheme manager";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
+
+  outputs =
+    { self, nixpkgs, ... }:
+    let
+      supportedSystems = [
+        "x86_64-linux"
+      ];
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+      nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
+
+      baseVersion = nixpkgs.lib.removeSuffix "\n" (builtins.readFile ./VERSION);
+
+      semver =
+        if self ? rev then
+          "${baseVersion}+git.${builtins.substring 0 7 self.rev}"
+        else
+          "${baseVersion}+dev";
+    in
+    {
+      packages = forAllSystems (
+        system:
+        let
+          pkgs = nixpkgsFor.${system};
+        in
+        rec {
+          clrsync = pkgs.callPackage ./package.nix { inherit semver; };
+          default = clrsync;
+        }
+      );
+
+      homeModules = {
+        default = import ./home-manager-module.nix self;
+        clrsync = self.homeModules.default;
+      };
+
+      apps = forAllSystems (system: {
+        clrsync-gui = {
+          type = "app";
+          program = "${self.packages.${system}.clrsync}/bin/clrsync_gui";
+          meta = {
+            description = "clrsync gui app";
+            license = self.packages.x86_64-linux.licenses.mit;
+            maintainers = [ "Daniel Dada" ];
+          };
+        };
+
+        clrsync-cli = {
+          type = "app";
+          program = "${self.packages.${system}.clrsync}/bin/clrsync_cli";
+          meta = {
+            description = "clrsync cli app";
+            license = self.packages.x86_64-linux.licenses.mit;
+            maintainers = [ "Daniel Dada" ];
+          };
+        };
+
+        default = self.apps.${system}.clrsync-cli;
+      });
+
+      devShells = forAllSystems (
+        system:
+        let
+          pkgs = nixpkgsFor.${system};
+          clrsync = self.packages.${system}.clrsync;
+        in
+        {
+          default = pkgs.mkShell {
+            inputsFrom = [ clrsync ];
+            packages = with pkgs; [
+              cmake
+              ninja
+              clang-tools
+              gdb
+            ];
+
+            shellHook = ''
+              export CMAKE_GENERATOR="Ninja"
+              export CMAKE_EXPORT_COMPILE_COMMANDS=1
+            '';
+          };
+        }
+      );
+
+      overlays.default = final: prev: {
+        clrsync = self.packages.${final.system}.clrsync;
+      };
+    };
+}

home-manager-module.nix

@@ -0,0 +1,155 @@
+flake:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+let
+  cfg = config.programs.clrsync;
+
+  clrsyncPackage = flake.packages.${pkgs.system}.default;
+
+  templateType = types.submodule {
+    options = {
+      enabled = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether to enable this template.";
+      };
+      inputPath = mkOption {
+        type = types.str;
+        description = "Path to the template input file.";
+      };
+      outputPath = mkOption {
+        type = types.str;
+        description = "Path where the generated output will be written.";
+      };
+      reloadCmd = mkOption {
+        type = types.str;
+        default = "";
+        description = "Command to run after generating the output.";
+      };
+    };
+  };
+
+  configFormat = pkgs.formats.toml { };
+  configFile = configFormat.generate "config.toml" {
+    general = {
+      default_theme = cfg.defaultTheme;
+      palettes_path = cfg.palettesPath;
+      font = cfg.font;
+      font_size = cfg.fontSize;
+    };
+    templates = mapAttrs (
+      name: template: {
+        enabled = template.enabled;
+        input_path = template.inputPath;
+        output_path = template.outputPath;
+        reload_cmd = template.reloadCmd;
+      }
+    ) cfg.templates;
+  };
+in
+{
+  options.programs.clrsync = {
+    enable = mkEnableOption "clrsync color synchronization";
+
+    defaultTheme = mkOption {
+      type = types.str;
+      default = "cursed";
+      description = "Default theme to use.";
+    };
+
+    palettesPath = mkOption {
+      type = types.str;
+      default = "~/.config/clrsync/palettes";
+      description = "Path to color palettes directory.";
+    };
+
+    font = mkOption {
+      type = types.str;
+      default = "JetBrainsMono Nerd Font Mono";
+      description = "Font family to use.";
+    };
+
+    fontSize = mkOption {
+      type = types.int;
+      default = 14;
+      description = "Font size.";
+    };
+
+    templates = mkOption {
+      type = types.attrsOf templateType;
+      default = { };
+      description = "Template configurations.";
+      example = literalExpression ''
+        {
+          kitty = {
+            enabled = true;
+            inputPath = "~/.config/clrsync/templates/kitty.conf";
+            outputPath = "~/.config/kitty/kitty_test.conf";
+            reloadCmd = "pkill -SIGUSR1 kitty";
+          };
+        }
+      '';
+    };
+
+    applyTheme = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Whether to apply the default theme on activation.";
+    };
+
+    systemdTarget = mkOption {
+      type = types.str;
+      default = "graphical-session.target";
+      description = "Systemd target to bind the clrsync service to.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [ clrsyncPackage ];
+
+      xdg.enable = true;
+
+    home.activation.clrsyncDesktop = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+      if [ -d "$HOME/.nix-profile/share/applications" ]; then
+        ${pkgs.desktop-file-utils}/bin/update-desktop-database "$HOME/.nix-profile/share/applications" || true
+      fi
+    '';
+
+    xdg.configFile."clrsync/config.toml" = {
+      source = configFile;
+      force = true;
+    };
+
+    home.activation.clrsyncConfig = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+      run --quiet mkdir -p $HOME/.config/clrsync
+      run --quiet cp -f ${configFile} $HOME/.config/clrsync/config.toml
+    '';
+
+    home.activation.clrsyncApply = mkIf cfg.applyTheme (
+      lib.hm.dag.entryAfter [ "clrsyncConfig" ] ''
+        run --quiet ${clrsyncPackage}/bin/clrsync_cli --apply --theme ${cfg.defaultTheme}
+      ''
+    );
+
+    systemd.user.services.clrsync = mkIf cfg.applyTheme {
+      Unit = {
+        Description = "Apply clrsync color palette";
+        After = [ cfg.systemdTarget ];
+        PartOf = [ cfg.systemdTarget ];
+      };
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${clrsyncPackage}/bin/clrsync_cli --apply --theme ${cfg.defaultTheme}";
+        RemainAfterExit = true;
+      };
+      Install = {
+        WantedBy = [ cfg.systemdTarget ];
+      };
+    };
+  };
+}

package.nix

@@ -0,0 +1,102 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  git,
+  pkg-config,
+  makeWrapper,
+  wayland-protocols,
+  glfw,
+  freetype,
+  fontconfig,
+  mesa,
+  xorg,
+  wayland,
+  libxkbcommon,
+  zlib,
+  bzip2,
+  wayland-scanner,
+  gtk3,
+  semver
+}:
+
+stdenv.mkDerivation rec {
+  pname = "clrsync";
+
+  version = semver;
+
+  src = lib.cleanSourceWith {
+    src = ./.;
+    filter =
+      path: type:
+      let
+        baseName = baseNameOf path;
+      in
+      !(
+        lib.hasSuffix ".o" baseName
+        || lib.hasSuffix ".a" baseName
+        || baseName == "build"
+        || baseName == "CMakeCache.txt"
+        || baseName == "CMakeFiles"
+        || baseName == ".git"
+        || baseName == "result"
+        || baseName == ".direnv"
+      );
+  };
+
+  nativeBuildInputs = [
+    cmake
+    git
+    pkg-config
+    makeWrapper
+    wayland-protocols
+  ];
+
+  buildInputs = [
+    glfw
+    freetype
+    fontconfig
+    xorg.libXcursor
+    mesa
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libXinerama
+    wayland
+    wayland-scanner
+    wayland-protocols
+    libxkbcommon
+    zlib
+    bzip2
+    gtk3
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DUSE_SYSTEM_GLFW=ON"
+    "-DCLRSYNC_SEMVER=${version}"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    cmake --install . --prefix $out
+
+    wrapProgram $out/bin/clrsync_gui \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}
+
+    wrapProgram $out/bin/clrsync_cli \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Color scheme manager with GUI and CLI";
+    homepage = "https://github.com/obsqrbtz/clrsync";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    mainProgram = "clrsync_gui";
+    maintainers = [ ];
+  };
+}

src/cli/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_executable(clrsync_cli main.cpp)
+
+target_include_directories(clrsync_cli PRIVATE 
+    ${CMAKE_SOURCE_DIR}/src 
+    SYSTEM ${CMAKE_SOURCE_DIR}/lib
+)
+
+target_link_libraries(clrsync_cli PRIVATE clrsync_core)

src/cli/main.cpp

@@ -1,16 +1,17 @@
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 #include <string>
 
 #include <argparse/argparse.hpp>
 
-#include <core/utils.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_template.hpp>
 #include <core/theme/theme_renderer.hpp>
+#include <core/theme/theme_template.hpp>
+#include <core/utils.hpp>
 #include <core/version.hpp>
 
 void handle_show_vars()
@@ -21,8 +22,7 @@ void handle_show_vars()
 void handle_list_themes()
 {
     auto palette_manager = clrsync::core::palette_manager<clrsync::core::io::toml_file>();
-    palette_manager.load_palettes_from_directory(
-        clrsync::core::config::instance().palettes_path());
+    palette_manager.load_palettes_from_directory(clrsync::core::config::instance().palettes_path());
 
     const auto &palettes = palette_manager.palettes();
     std::cout << "Available themes:" << std::endl;
@@ -36,16 +36,17 @@ int handle_apply_theme(const argparse::ArgumentParser &program, const std::strin
 {
     clrsync::core::theme_renderer<clrsync::core::io::toml_file> renderer;
     std::string theme_identifier;
+    clrsync::core::Result<void> result = clrsync::core::Ok();
 
     if (program.is_used("--theme"))
     {
         theme_identifier = program.get<std::string>("--theme");
-        renderer.apply_theme(theme_identifier);
+        result = renderer.apply_theme(theme_identifier);
     }
     else if (program.is_used("--path"))
     {
         theme_identifier = program.get<std::string>("--path");
-        renderer.apply_theme_from_path(theme_identifier);
+        result = renderer.apply_theme_from_path(theme_identifier);
     }
     else
     {
@@ -55,43 +56,41 @@ int handle_apply_theme(const argparse::ArgumentParser &program, const std::strin
             return 1;
         }
         theme_identifier = default_theme;
-        renderer.apply_theme(theme_identifier);
+        result = renderer.apply_theme(theme_identifier);
+    }
+
+    if (!result)
+    {
+        std::cerr << "Failed to apply theme: " << result.error().description() << std::endl;
+        return 1;
     }
 
     std::cout << "Applied theme " << theme_identifier << std::endl;
     return 0;
 }
 
-void initialize_config(const std::string &config_path)
+clrsync::core::Result<void> initialize_config(const std::string &config_path)
 {
     auto conf = std::make_unique<clrsync::core::io::toml_file>(config_path);
-    clrsync::core::config::instance().initialize(std::move(conf));
+    return clrsync::core::config::instance().initialize(std::move(conf));
 }
 
 void setup_argument_parser(argparse::ArgumentParser &program)
 {
-    program.add_argument("-a", "--apply")
-        .help("applies default theme")
-        .flag();
+    program.add_argument("-a", "--apply").help("applies default theme").flag();
 
     program.add_argument("-c", "--config")
         .default_value(clrsync::core::get_default_config_path())
         .help("sets config file path")
         .metavar("PATH");
 
-    program.add_argument("-l", "--list-themes")
-        .help("lists available themes")
-        .flag();
+    program.add_argument("-l", "--list-themes").help("lists available themes").flag();
 
-    program.add_argument("-s", "--show-vars")
-        .help("shows color keys")
-        .flag();
+    program.add_argument("-s", "--show-vars").help("shows color keys").flag();
 
     auto &group = program.add_mutually_exclusive_group();
-    group.add_argument("-t", "--theme")
-        .help("sets theme <theme_name> to apply");
-    group.add_argument("-p", "--path")
-        .help("sets theme file <path/to/theme> to apply");
+    group.add_argument("-t", "--theme").help("sets theme <theme_name> to apply");
+    group.add_argument("-p", "--path").help("sets theme file <path/to/theme> to apply");
 }
 
 int main(int argc, char *argv[])
@@ -112,13 +111,10 @@ int main(int argc, char *argv[])
 
     std::string config_path = program.get<std::string>("--config");
 
-    try
+    auto config_result = initialize_config(config_path);
+    if (!config_result)
     {
-        initialize_config(config_path);
-    }
-    catch (const std::exception &err)
-    {
-        std::cerr << "Error loading config: " << err.what() << std::endl;
+        std::cerr << "Error loading config: " << config_result.error().description() << std::endl;
         return 1;
     }
 

src/core/CMakeLists.txt

@@ -0,0 +1,21 @@
+set(CORE_SOURCES
+    palette/color.cpp
+    io/toml_file.cpp
+    config/config.cpp
+    utils.cpp
+    version.cpp
+    theme/theme_template.cpp
+)
+
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+
+add_library(clrsync_core SHARED ${CORE_SOURCES})
+
+target_include_directories(clrsync_core PUBLIC 
+    ${CMAKE_SOURCE_DIR}/src 
+    SYSTEM ${CMAKE_SOURCE_DIR}/lib
+)
+
+target_compile_definitions(clrsync_core PUBLIC
+    CLRSYNC_DATADIR=\"${CMAKE_INSTALL_FULL_DATADIR}/clrsync\"
+)

src/core/config/config.cpp

@@ -1,13 +1,15 @@
 #include "config.hpp"
 #include "core/utils.hpp"
+#include "core/error.hpp"
 
 #include <core/palette/color.hpp>
 #include <filesystem>
-#include <stdexcept>
+#include <fstream>
 
 #ifdef _WIN32
 #include "windows.h"
 #endif
+#include <iostream>
 
 namespace clrsync::core
 {
@@ -17,24 +19,24 @@ config &config::instance()
     return inst;
 }
 
-void config::initialize(std::unique_ptr<clrsync::core::io::file> file)
+Result<void> config::initialize(std::unique_ptr<clrsync::core::io::file> file)
 {
     copy_default_configs();
     m_file = std::move(file);
-    if (m_file)
-        if (!m_file->parse())
-            throw std::runtime_error{"Could not parse config file"};
+    if (!m_file)
+        return Err<void>(error_code::config_missing, "Config file is missing");
+    
+    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 Ok();
 }
 
 std::filesystem::path config::get_user_config_dir()
 {
-    auto home = expand_user("~");
-#ifdef _WIN32
-    return home + "\\.config\\clrsync";
-
-#else
-    return home + "/.config/clrsync";
-#endif
+    std::filesystem::path home = normalize_path("~");
+    return home / ".config" / "clrsync";
 }
 
 std::filesystem::path config::get_data_dir()
@@ -56,25 +58,79 @@ std::filesystem::path config::get_data_dir()
 #endif
 }
 
+void config::copy_file(const std::filesystem::path &src, const std::filesystem::path &dst)
+{
+    if (std::filesystem::exists(dst))
+        return;
+
+    if (!std::filesystem::exists(src))
+        return;
+
+    std::ifstream in(src, std::ios::binary);
+    std::ofstream out(dst, std::ios::binary);
+    
+    if (!in || !out)
+        return;
+    
+    out << in.rdbuf();
+}
+
+void config::copy_dir(const std::filesystem::path &src, const std::filesystem::path &dst)
+{
+    if (!std::filesystem::exists(src))
+        return;
+    
+    for (auto const &entry : std::filesystem::recursive_directory_iterator(src))
+    {
+        auto rel = std::filesystem::relative(entry.path(), src);
+        auto out = dst / rel;
+
+        if (entry.is_directory())
+        {
+            std::filesystem::create_directories(out);
+        }
+        else if (entry.is_regular_file())
+        {
+            copy_file(entry.path(), out);
+        }
+    }
+}
+
 void config::copy_default_configs()
 {
-    std::filesystem::path user_config = get_user_config_dir();
-    std::filesystem::path default_dir = get_data_dir();
+    std::filesystem::path user_dir = get_user_config_dir();
+    std::filesystem::path system_dir = get_data_dir();
 
-    if (!std::filesystem::exists(user_config))
-    {
-        std::filesystem::create_directories(user_config);
+    std::filesystem::create_directories(user_dir);
 
-        std::filesystem::copy(default_dir / "config.toml", user_config / "config.toml");
-        std::filesystem::copy(default_dir / "templates", user_config / "templates",
-                              std::filesystem::copy_options::recursive);
-        std::filesystem::copy(default_dir / "palettes", user_config / "palettes",
-                              std::filesystem::copy_options::recursive);
+    if (system_dir.empty())
         return;
-    }
-    if (!std::filesystem::exists(user_config / "config.toml"))
+
     {
-        std::filesystem::copy(default_dir / "config.toml", user_config / "config.toml");
+        auto src = system_dir / "config.toml";
+        auto dst = user_dir / "config.toml";
+        if (!std::filesystem::exists(dst))
+            copy_file(src, dst);
+    }
+
+    {
+        auto src = system_dir / "templates";
+        auto dst = user_dir / "templates";
+
+        if (!std::filesystem::exists(dst))
+            std::filesystem::create_directories(dst);
+
+        copy_dir(src, dst);
+    }
+
+    {
+        auto src = system_dir / "palettes";
+        auto dst = user_dir / "palettes";
+
+        if (!std::filesystem::exists(dst))
+            std::filesystem::create_directories(dst);
+
+        copy_dir(src, dst);
     }
 }
 
@@ -106,50 +162,79 @@ const uint32_t config::font_size() const
     return 14;
 }
 
-void config::set_default_theme(const std::string &theme)
+Result<void> config::set_default_theme(const std::string &theme)
 {
-    if (m_file)
-    {
+    if (!m_file)
+        return Err<void>(error_code::config_missing, "Configuration not initialized");
+    
     m_file->set_value("general", "default_theme", theme);
-        m_file->save_file();
-    }
+    return m_file->save_file();
 }
 
-void config::set_palettes_path(const std::string &path)
+Result<void> config::set_palettes_path(const std::string &path)
 {
-    if (m_file)
-    {
+    if (!m_file)
+        return Err<void>(error_code::config_missing, "Configuration not initialized");
+    
     m_file->set_value("general", "palettes_path", path);
-        m_file->save_file();
-    }
+    return m_file->save_file();
 }
 
-void config::set_font(const std::string &font)
+Result<void> config::set_font(const std::string &font)
 {
-    if (m_file)
-    {
+    if (!m_file)
+        return Err<void>(error_code::config_missing, "Configuration not initialized");
+    
     m_file->set_value("general", "font", font);
-        m_file->save_file();
-    }
+    return m_file->save_file();
 }
-void config::set_font_size(int font_size)
+Result<void> config::set_font_size(int font_size)
 {
-    if (m_file)
-    {
+    if (!m_file)
+        return Err<void>(error_code::config_missing, "Configuration not initialized");
+    
     m_file->set_value("general", "font_size", font_size);
-        m_file->save_file();
-    }
+    return m_file->save_file();
 }
 
-void config::update_template(const std::string &key,
+Result<void> config::update_template(const std::string &key,
                              const clrsync::core::theme_template &theme_template)
 {
+    if (!m_file)
+        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());
-    m_file->save_file();
+    return m_file->save_file();
+}
+
+Result<void> config::remove_template(const std::string &key)
+{
+    if (!m_file)
+        return Err<void>(error_code::config_missing, "Configuration not initialized");
+    
+    auto it = m_themes.find(key);
+    if (it == m_themes.end())
+        return Err<void>(error_code::template_not_found, "Template not found", key);
+    
+    std::filesystem::path template_file = it->second.template_path();
+    if (std::filesystem::exists(template_file))
+    {
+        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());
+        }
+    }
+    
+    m_themes.erase(it);
+    
+    m_file->remove_section("templates." + key);
+    
+    return m_file->save_file();
 }
 
 const std::unordered_map<std::string, clrsync::core::theme_template> config::templates()
@@ -172,21 +257,21 @@ const std::unordered_map<std::string, clrsync::core::theme_template> config::tem
                 theme.set_enabled(false);
             }
             theme.set_reload_command(std::get<std::string>(current["reload_cmd"]));
-            theme.load_template();
+            (void)theme.load_template();
             m_themes.insert({theme.name(), theme});
         }
     }
     return m_themes;
 }
 
-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 it->second;
+        return Ok(&it->second);
     }
-    throw std::runtime_error("Template not found: " + name);
+    return Err<const clrsync::core::theme_template*>(error_code::template_not_found, "Template not found", name);
 }
 
 } // namespace clrsync::core

src/core/config/config.hpp

@@ -3,6 +3,7 @@
 
 #include <core/io/file.hpp>
 #include <core/theme/theme_template.hpp>
+#include <core/error.hpp>
 #include <filesystem>
 #include <memory>
 #include <string>
@@ -14,24 +15,25 @@ class config
   public:
     static config &instance();
 
-    void initialize(std::unique_ptr<clrsync::core::io::file> file);
+    Result<void> initialize(std::unique_ptr<clrsync::core::io::file> file);
 
     const std::string font() const;
     const uint32_t font_size() const;
     const std::string &palettes_path();
     const std::string default_theme() const;
     const std::unordered_map<std::string, clrsync::core::theme_template> templates();
-    const clrsync::core::theme_template &template_by_name(const std::string &name) const;
+    Result<const clrsync::core::theme_template*> template_by_name(const std::string &name) const;
     std::filesystem::path get_user_config_dir();
 
     
-    void set_default_theme(const std::string &theme);
-    void set_palettes_path(const std::string &path);
-    void set_font(const std::string &font);
-    void set_font_size(int font_size);
+    Result<void> set_default_theme(const std::string &theme);
+    Result<void> set_palettes_path(const std::string &path);
+    Result<void> set_font(const std::string &font);
+    Result<void> set_font_size(int font_size);
 
-    void update_template(const std::string &key,
+    Result<void> update_template(const std::string &key,
                          const clrsync::core::theme_template &theme_template);
+    Result<void> remove_template(const std::string &key);
     static std::filesystem::path get_data_dir();
 
   private:
@@ -42,6 +44,8 @@ class config
     std::string m_palettes_dir{};
     std::unique_ptr<io::file> m_file;
     std::unordered_map<std::string, theme_template> m_themes{};
+    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();
 };
 } // namespace clrsync::core

src/core/error.hpp

@@ -0,0 +1,207 @@
+#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

src/core/io/file.hpp

@@ -4,6 +4,7 @@
 #include <map>
 #include <string>
 #include <variant>
+#include <core/error.hpp>
 
 using value_type = std::variant<std::string, uint32_t, int, bool>;
 
@@ -14,7 +15,8 @@ class file
   public:
     file() = default;
     file(std::string path) {};
-    virtual bool parse() { return false; };
+    virtual ~file() = default;
+    virtual Result<void> parse() { return Ok(); };
     virtual const std::string get_string_value(const std::string &section,
                                                const std::string &key) const
     {
@@ -39,7 +41,8 @@ class file
     }
     virtual void insert_or_update_value(const std::string &section, const std::string &key,
                                         const value_type &value) {};
-    virtual void save_file() {};
+    virtual void remove_section(const std::string &section) {};
+    virtual Result<void> save_file() { return Ok(); };
 };
 } // namespace clrsync::core::io
 #endif

src/core/io/toml_file.cpp

@@ -8,15 +8,16 @@ namespace clrsync::core::io
 {
 toml_file::toml_file(std::string path)
 {
-    m_path = expand_user(path);
+    m_path = normalize_path(path).string();
 }
 
-bool toml_file::parse()
+Result<void> toml_file::parse()
 {
     if (!std::filesystem::exists(m_path))
-        return false;
+        return Err<void>(error_code::file_not_found, "File does not exist", m_path);
+    
     m_file = toml::parse_file(m_path);
-    return true;
+    return Ok();
 }
 
 const std::string toml_file::get_string_value(const std::string &section,
@@ -63,7 +64,7 @@ std::map<std::string, value_type> toml_file::get_table(const std::string &sectio
         else if (auto d = val.value<double>())
             result[std::string(p.first.str())] = static_cast<uint32_t>(*d);
         else
-            result[std::string(p.first.str())] = {}; // fallback for unsupported types
+            result[std::string(p.first.str())] = {};
     }
 
     return result;
@@ -91,11 +92,42 @@ void toml_file::insert_or_update_value(const std::string &section, const std::st
     std::visit([&](auto &&v) { tbl->insert_or_assign(key, v); }, value);
 }
 
-void toml_file::save_file()
+void toml_file::remove_section(const std::string &section)
 {
+    toml::table *tbl = m_file.as_table();
+    auto parts = split(section, '.');
+    
+    if (parts.empty())
+        return;
+    
+    for (size_t i = 0; i < parts.size() - 1; ++i)
+    {
+        auto *sub = (*tbl)[parts[i]].as_table();
+        if (!sub)
+            return;
+        tbl = sub;
+    }
+    
+    tbl->erase(parts.back());
+}
+
+Result<void> toml_file::save_file()
+{
+    try {
         std::filesystem::create_directories(std::filesystem::path(m_path).parent_path());
+    } catch (const std::exception& e) {
+        return Err<void>(error_code::dir_create_failed, e.what(), m_path);
+    }
+    
     std::ofstream stream(m_path, std::ios::binary);
+    if (!stream)
+        return Err<void>(error_code::file_write_failed, "Failed to open file for writing", m_path);
+    
     stream << m_file;
+    if (!stream)
+        return Err<void>(error_code::file_write_failed, "Failed to write to file", m_path);
+    
+    return Ok();
 }
 
 std::vector<std::string> toml_file::split(const std::string &s, char delim) const

src/core/io/toml_file.hpp

@@ -1,6 +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 <string>
 #include <toml/toml.hpp>
 
@@ -10,7 +11,7 @@ class toml_file : public file
 {
   public:
     explicit toml_file(std::string path);
-    bool parse() override;
+    Result<void> parse() override;
     const std::string get_string_value(const std::string &section,
                                        const std::string &key) const override;
     uint32_t get_uint_value(const std::string &section, const std::string &key) const override;
@@ -18,7 +19,8 @@ class toml_file : public file
     std::map<std::string, value_type> get_table(const std::string &section_path) const override;
     void insert_or_update_value(const std::string &section, const std::string &key,
                                 const value_type &value) override;
-    void save_file() override;
+    void remove_section(const std::string &section) override;
+    Result<void> save_file() override;
 
   private:
     toml::parse_result m_file{};

src/core/palette/color_keys.hpp

@@ -1,7 +1,10 @@
 #ifndef CLRSYNC_CORE_PALETTE_COLOR_KEYS_HPP
 #define CLRSYNC_CORE_PALETTE_COLOR_KEYS_HPP
 #include <cstddef>
+#include <cstdint>
 #include <iterator>
+#include <unordered_map>
+#include <string>
 
 namespace clrsync::core
 {
@@ -14,7 +17,7 @@ constexpr const char* COLOR_KEYS[] = {
     "on_surface",
 
     "surface_variant",
-    "on_surface_varuant",
+    "on_surface_variant",
 
     "border_focused",
     "border",
@@ -72,5 +75,67 @@ constexpr const char* COLOR_KEYS[] = {
 };
 
 constexpr size_t NUM_COLOR_KEYS = std::size(COLOR_KEYS);
+
+inline const std::unordered_map<std::string, uint32_t> DEFAULT_COLORS = {
+    {"background", 0x1e1e1eff},
+    {"on_background", 0xd4d4d4ff},
+    
+    {"surface", 0x252526ff},
+    {"on_surface", 0xe8e8e8ff},
+    
+    {"surface_variant", 0x2d2d30ff},
+    {"on_surface_variant", 0xccccccff},
+    
+    {"border_focused", 0x007accff},
+    {"border", 0x3e3e42ff},
+    
+    {"foreground", 0xccccccff},
+    
+    {"cursor", 0xaeafadff},
+    {"accent", 0x0e639cff},
+    
+    {"success", 0x4ec9b0ff},
+    {"info", 0x4fc1ffff},
+    {"warning", 0xdcdcaaff},
+    {"error", 0xf48771ff},
+    
+    {"on_success", 0x000000ff},
+    {"on_info", 0x000000ff},
+    {"on_warning", 0x000000ff},
+    {"on_error", 0xffffffff},
+    
+    {"editor_background", 0x1e1e1eff},
+    {"editor_command", 0xd7ba7dff},
+    {"editor_comment", 0x6a9955ff},
+    {"editor_disabled", 0x808080ff},
+    {"editor_emphasis", 0x569cd6ff},
+    {"editor_error", 0xf44747ff},
+    {"editor_inactive", 0x858585ff},
+    {"editor_line_number", 0x858585ff},
+    {"editor_link", 0x3794ffff},
+    {"editor_main", 0xd4d4d4ff},
+    {"editor_selected", 0x264f78ff},
+    {"editor_selection_inactive", 0x3a3d41ff},
+    {"editor_string", 0xce9178ff},
+    {"editor_success", 0x89d185ff},
+    {"editor_warning", 0xcca700ff},
+    
+    {"base00", 0x181818ff},
+    {"base01", 0x282828ff},
+    {"base02", 0x383838ff},
+    {"base03", 0x585858ff},
+    {"base04", 0xb8b8b8ff},
+    {"base05", 0xd8d8d8ff},
+    {"base06", 0xe8e8e8ff},
+    {"base07", 0xf8f8f8ff},
+    {"base08", 0xab4642ff},
+    {"base09", 0xdc9656ff},
+    {"base0A", 0xf7ca88ff},
+    {"base0B", 0xa1b56cff},
+    {"base0C", 0x86c1b9ff},
+    {"base0D", 0x7cafc2ff},
+    {"base0E", 0xba8bafff},
+    {"base0F", 0xa16946ff},
+};
 } // namespace clrsync::core
 #endif

src/core/palette/palette.hpp

@@ -5,6 +5,7 @@
 #include <unordered_map>
 
 #include <core/palette/color.hpp>
+#include <core/palette/color_keys.hpp>
 
 namespace clrsync::core
 {
@@ -37,9 +38,16 @@ class palette
         {
             return it->second;
         }
-        static color default_color{};
+        auto default_it = DEFAULT_COLORS.find(key);
+        if (default_it != DEFAULT_COLORS.end())
+        {
+            static color default_color;
+            default_color.set(default_it->second);
             return default_color;
         }
+        static color empty_color{};
+        return empty_color;
+    }
 
     const std::unordered_map<std::string, color> &colors() const
     {

src/core/palette/palette_file.hpp

@@ -26,14 +26,26 @@ template <typename FileType> class palette_file
         if (!m_file->parse())
             return false;
         m_palette.set_name(m_file->get_string_value("general", "name"));
+        
+        for (const auto &color_key : COLOR_KEYS)
+        {
+            auto it = DEFAULT_COLORS.find(color_key);
+            if (it != DEFAULT_COLORS.end())
+            {
+                m_palette.set_color(color_key, core::color(it->second));
+            }
+        }
+        
         for (const auto &color_key : COLOR_KEYS)
         {
             auto color_str = m_file->get_string_value("colors", color_key);
-            core::color color{0x000000FF};
             if (!color_str.empty())
+            {
+                core::color color;
                 color.from_hex_string(color_str);
                 m_palette.set_color(color_key, color);
             }
+        }
         return true;
     }
     core::palette palette() const
@@ -52,7 +64,7 @@ template <typename FileType> class palette_file
     }
     void save()
     {
-        m_file->save_file();
+        (void)m_file->save_file();
     }
 
   private:

src/core/palette/palette_manager.hpp

@@ -19,12 +19,9 @@ template <typename FileType> class palette_manager
     palette_manager() = default;
     void load_palettes_from_directory(const std::string &directory_path)
     {
-        auto directory_path_expanded = expand_user(directory_path);
+        std::filesystem::path directory_path_expanded = normalize_path(directory_path);
         if (!std::filesystem::exists(directory_path_expanded))
-        {
-            std::cerr << "Palettes directory does not exist\n" ;
             return;
-        }
         for (const auto &entry : std::filesystem::directory_iterator(directory_path_expanded))
         {
             if (entry.is_regular_file())
@@ -37,8 +34,9 @@ template <typename FileType> class palette_manager
     }
     void save_palette_to_file(const palette &pal, const std::string &directory_path) const
     {
-        std::string file_path = directory_path + "/" + pal.name() + ".toml";
-        palette_file<FileType> pal_file(file_path);
+        std::filesystem::path dir_path = normalize_path(directory_path);
+        std::filesystem::path file_path = dir_path / (pal.name() + ".toml");
+        palette_file<FileType> pal_file(file_path.string());
         pal_file.save_palette(pal);
     }
 

src/core/theme/theme_renderer.hpp

@@ -3,6 +3,7 @@
 #include <core/config/config.hpp>
 #include <core/palette/palette_manager.hpp>
 #include <core/theme/template_manager.hpp>
+#include <core/error.hpp>
 #include <string>
 
 namespace clrsync::core
@@ -18,39 +19,53 @@ template <typename FileType> class theme_renderer
         m_template_manager = template_manager<FileType>();
     }
 
-    void apply_theme(const std::string &theme_name)
+    Result<void> apply_theme(const std::string &theme_name)
     {
         auto palette = m_pal_manager.get_palette(theme_name);
         if (!palette)
-            throw std::runtime_error("Palette not found: " + theme_name);
-        apply_palette_to_all_templates(*palette);
+            return Err<void>(error_code::palette_not_found, "Palette not found", theme_name);
+        return apply_palette_to_all_templates(*palette);
     }
-    void apply_theme_from_path(const std::string &path)
+    
+    Result<void> apply_theme_from_path(const std::string &path)
     {
         auto palette = m_pal_manager.load_palette_from_file(path);
-        apply_palette_to_all_templates(palette);
+        return apply_palette_to_all_templates(palette);
     }
 
   private:
     palette_manager<FileType> m_pal_manager;
     template_manager<FileType> m_template_manager;
 
-    void apply_palette_to_all_templates(const palette &pal)
+    Result<void> apply_palette_to_all_templates(const palette &pal)
     {
         for (auto &t_pair : m_template_manager.templates())
         {
             auto &tmpl = t_pair.second;
             if (!tmpl.enabled())
                 continue;
-            tmpl.load_template();
+            
+            auto load_result = tmpl.load_template();
+            if (!load_result)
+                return load_result;
+            
             tmpl.apply_palette(pal);
-            tmpl.save_output();
+            
+            auto save_result = tmpl.save_output();
+            if (!save_result)
+                return save_result;
+            
             if (!tmpl.reload_command().empty())
             {
-                std::system(tmpl.reload_command().c_str());
+                int result = std::system(tmpl.reload_command().c_str());
+                if (result != 0)
+                {
+                    std::cerr << "Warning: Command " << tmpl.reload_command() << " failed with code " << result << "\n";
                 }
             }
         }
+        return Ok();
+    }
 };
 
 } // namespace clrsync::core

src/core/theme/theme_template.cpp

@@ -8,8 +8,8 @@ namespace clrsync::core
 {
 theme_template::theme_template(const std::string &name, const std::string &template_path,
                                const std::string &out_path)
-    : m_name(name), m_template_path(expand_user(template_path)),
-      m_output_path(expand_user(out_path))
+    : m_name(name), m_template_path(normalize_path(template_path).string()),
+      m_output_path(normalize_path(out_path).string())
 {
 }
 
@@ -30,7 +30,7 @@ const std::string &theme_template::template_path() const
 
 void theme_template::set_template_path(const std::string &path)
 {
-    m_template_path = expand_user(path);
+    m_template_path = normalize_path(path).string();
 }
 
 const std::string &theme_template::output_path() const
@@ -40,21 +40,24 @@ const std::string &theme_template::output_path() const
 
 void theme_template::set_output_path(const std::string &path)
 {
-    m_output_path = expand_user(path);
+    m_output_path = normalize_path(path).string();
 }
 
-void theme_template::load_template()
+Result<void> theme_template::load_template()
 {
     if (!std::filesystem::exists(m_template_path))
     {
-        std::cerr << "Template file '" << m_template_path << "' is missing\n";
-        return;
+        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)
-        throw std::runtime_error("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>());
+    return Ok();
 }
 
 void theme_template::apply_palette(const core::palette &palette)
@@ -87,14 +90,30 @@ void theme_template::apply_palette(const core::palette &palette)
     }
 }
 
-void theme_template::save_output() const
+Result<void> theme_template::save_output() const
 {
+    try
+    {
         std::filesystem::create_directories(std::filesystem::path(m_output_path).parent_path());
+    }
+    catch (const std::exception& e)
+    {
+        return Err<void>(error_code::dir_create_failed, e.what(), m_output_path);
+    }
+    
     std::ofstream output(m_output_path, std::ios::binary);
     if (!output)
-        throw std::runtime_error("Failed to write output file: " + 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 Ok();
 }
 
 const std::string &theme_template::raw_template() const

src/core/theme/theme_template.hpp

@@ -2,6 +2,7 @@
 #define clrsync_CORE_IO_THEME_TEMPLATE_HPP
 
 #include <core/palette/palette.hpp>
+#include <core/error.hpp>
 #include <string>
 
 namespace clrsync::core
@@ -26,11 +27,11 @@ class theme_template
 
     void set_output_path(const std::string &path);
 
-    void load_template();
+    Result<void> load_template();
 
     void apply_palette(const core::palette &palette);
 
-    void save_output() const;
+    Result<void> save_output() const;
 
     const std::string &raw_template() const;
 

src/core/utils.cpp

@@ -1,5 +1,6 @@
 #include "utils.hpp"
 #include <iostream>
+#include <filesystem>
 
 namespace clrsync::core
 {
@@ -13,18 +14,21 @@ void print_color_keys()
 
 std::string get_default_config_path()
 {
-    auto home = expand_user("~");
-#ifdef _WIN32
-    return home + "\\.config\\clrsync\\config.toml";
+    const char* env_path = std::getenv("CLRSYNC_CONFIG_PATH");
+    if (env_path && env_path[0] != '\0')
+        return normalize_path(env_path).string();
     
-#else
-    return home + "/.config/clrsync/config.toml";
-#endif
+    std::filesystem::path home = normalize_path("~");
+    std::filesystem::path config_path = home / ".config" / "clrsync" / "config.toml";
+    return config_path.string();
 }
 
 std::string expand_user(const std::string &path)
 {
-    if (!path.empty() && path[0] == '~')
+    if (path.empty() || path[0] != '~')
+        return path;
+    
+    if (path.length() == 1 || path[1] == '/' || path[1] == '\\')
     {
 #ifdef _WIN32
         const char *home = std::getenv("USERPROFILE");
@@ -33,9 +37,20 @@ std::string expand_user(const std::string &path)
 #endif
         if (!home)
             return path;
+        
+        if (path.length() == 1)
+            return std::string(home);
+        
         return std::string(home) + path.substr(1);
     }
     return path;
 }
 
+std::filesystem::path normalize_path(const std::string &path)
+{
+    std::string expanded = expand_user(path);
+    std::filesystem::path fs_path(expanded);
+    return fs_path.lexically_normal();
+}
+
 } // namespace clrsync::core

src/core/utils.hpp

@@ -2,6 +2,7 @@
 #define CLRSYNC_CORE_UTILS_HPP
 
 #include <string>
+#include <filesystem>
 
 #include <core/palette/color_keys.hpp>
 
@@ -10,5 +11,6 @@ namespace clrsync::core
 void print_color_keys();
 std::string get_default_config_path();
 std::string expand_user(const std::string &path);
+std::filesystem::path normalize_path(const std::string &path);
 } // namespace clrsync::core
 #endif // CLRSYNC_CORE_UTILS_HPP

src/core/version.cpp

@@ -4,7 +4,6 @@ namespace clrsync::core
 {
 const std::string version_string()
 {
-    return "v" + std::to_string(VERSION_MAJOR) + "." + std::to_string(VERSION_MINOR) + "." +
-           std::to_string(VERSION_PATCH);
+    return GIT_SEMVER;
 }
 } // namespace clrsync::core

src/core/version.hpp

@@ -1,15 +1,12 @@
 #ifndef CLRSYNC_CORE_VERSION_HPP
 #define CLRSYNC_CORE_VERSION_HPP
 
-#include <cstdint>
 #include <string>
 
 namespace clrsync::core
 {
 
-constexpr uint8_t VERSION_MAJOR = 0;
-constexpr uint8_t VERSION_MINOR = 1;
-constexpr uint8_t VERSION_PATCH = 3;
+const std::string GIT_SEMVER = "0.1.4+git.g92b06a9";
 
 const std::string version_string();
 } // namespace clrsync::core

src/core/version.hpp.in

@@ -1,15 +1,12 @@
 #ifndef CLRSYNC_CORE_VERSION_HPP
 #define CLRSYNC_CORE_VERSION_HPP
 
-#include <cstdint>
 #include <string>
 
 namespace clrsync::core
 {
 
-constexpr uint8_t VERSION_MAJOR = @PROJECT_VERSION_MAJOR@;
-constexpr uint8_t VERSION_MINOR = @PROJECT_VERSION_MINOR@;
-constexpr uint8_t VERSION_PATCH = @PROJECT_VERSION_PATCH@;
+const std::string GIT_SEMVER = "@SEMVER@";
 
 const std::string version_string();
 } // namespace clrsync::core

src/gui/CMakeLists.txt

@@ -0,0 +1,62 @@
+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
+    ${CMAKE_SOURCE_DIR}/lib/color_text_edit/TextEditor.cpp
+)
+
+add_executable(clrsync_gui ${GUI_SOURCES})
+
+target_include_directories(clrsync_gui PRIVATE 
+    ${CMAKE_SOURCE_DIR}/src 
+    SYSTEM ${CMAKE_SOURCE_DIR}/lib
+)
+
+if(WIN32)
+    target_link_libraries(clrsync_gui PRIVATE 
+        clrsync_core 
+        glfw 
+        imgui 
+        OpenGL::GL
+        shell32
+        ole32
+        uuid
+        comdlg32
+        shlwapi
+    )
+elseif(APPLE)
+    target_link_libraries(clrsync_gui PRIVATE
+        clrsync_core
+        glfw
+        imgui
+        OpenGL::GL
+        "-framework Cocoa"
+    )
+else() 
+    target_link_libraries(clrsync_gui PRIVATE
+        clrsync_core 
+        imgui
+        ${GLFW_LIBRARIES} 
+        ${WAYLAND_LIBS}
+        X11 
+        Xrandr 
+        Xi 
+        Fontconfig::Fontconfig 
+        OpenGL::GL
+        ${GTK3_LIBRARIES}
+    )
+    
+    target_include_directories(clrsync_gui PRIVATE ${GTK3_INCLUDE_DIRS})
+    target_compile_options(clrsync_gui PRIVATE ${GTK3_CFLAGS_OTHER})
+endif()

src/gui/about_window.cpp

@@ -1,12 +1,13 @@
 #include "about_window.hpp"
 #include "core/version.hpp"
+#include "imgui_helpers.hpp"
 #include "imgui.h"
 
 about_window::about_window()
 {
 }
 
-void about_window::render()
+void about_window::render(const clrsync::core::palette& pal)
 {
     if (!m_visible)
         return;
@@ -18,24 +19,24 @@ void about_window::render()
         const float window_width = ImGui::GetContentRegionAvail().x;
 
         ImGui::PushFont(ImGui::GetFont());
-        const char* title = "clrsync";
+        const char *title = "clrsync";
         const float title_size = ImGui::CalcTextSize(title).x;
         ImGui::SetCursorPosX((window_width - title_size) * 0.5f);
-        ImGui::TextColored(ImVec4(0.4f, 0.8f, 1.0f, 1.0f), "%s", title);
+        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);
-        ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "%s", version.c_str());
+        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::TextWrapped("A color scheme management tool.");
 
         ImGui::Spacing();
         ImGui::Spacing();
@@ -45,24 +46,41 @@ void about_window::render()
 
         ImGui::Text("Links:");
 
-        if (ImGui::Button("GitHub Repository", ImVec2(200, 0)))
+        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
+#ifdef _WIN32
             system("start https://github.com/obsqrbtz/clrsync");
-            #elif __APPLE__
+#elif __APPLE__
             system("open https://github.com/obsqrbtz/clrsync");
-            #else
+#else
             system("xdg-open https://github.com/obsqrbtz/clrsync");
-            #endif
+#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();
 
-        ImGui::TextColored(ImVec4(0.6f, 0.6f, 0.6f, 1.0f), "MIT License");
+        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 "
@@ -72,18 +90,7 @@ void about_window::render()
             "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::Spacing();
-        ImGui::Spacing();
-        
-        const float button_width = 120.0f;
-        ImGui::SetCursorPosX((window_width - button_width) * 0.5f);
-        if (ImGui::Button("Close", ImVec2(button_width, 0)))
-        {
-            m_visible = false;
-        }
+            "copies or substantial portions of the Software.");
     }
     ImGui::End();
 }

src/gui/about_window.hpp

@@ -1,17 +1,21 @@
 #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();
+    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

src/gui/color_scheme_editor.cpp

@@ -1,86 +1,21 @@
 #include "color_scheme_editor.hpp"
-#include "template_editor.hpp"
-#include "color_text_edit/TextEditor.h"
 #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()
 {
-    m_editor.SetLanguageDefinition(TextEditor::LanguageDefinition::CPlusPlus());
-    m_editor.SetText(R"(#include <iostream>
-#include <string>
-#include <vector>
-#include <filesystem>
-#include <cstdlib>
-
-namespace fs = std::filesystem;
-
-// Expands ~ to the user's home directory
-std::string expand_user(const std::string &path)
-{
-    if (path.empty()) return "";
-
-    std::string result;
-    if (path[0] == '~')
-    {
-#ifdef _WIN32
-        const char* home = std::getenv("USERPROFILE");
-#else
-        const char* home = std::getenv("HOME");
-#endif
-        result = home ? std::string(home) : "~";
-        result += path.substr(1);
-    }
-    else
-    {
-        result = path;
-    }
-
-    return result;
-}
-
-// Lists all files in a directory
-std::vector<std::string> list_files(const std::string &dir_path)
-{
-    std::vector<std::string> files;
-    try
-    {
-        for (const auto &entry : fs::directory_iterator(dir_path))
-        {
-            if (entry.is_regular_file())
-                files.push_back(entry.path().string());
-        }
-    }
-    catch (const std::exception &e)
-    {
-        std::cerr << "Error: " << e.what() << std::endl;
-    }
-    return files;
-}
-
-int main()
-{
-    std::string path = expand_user("~/Documents");
-    std::cout << "Listing files in: " << path << std::endl;
-
-    auto files = list_files(path);
-    for (const auto &f : files)
-        std::cout << "  " << f << std::endl;
-
-    return 0;
-})");
-
-    m_editor.SetShowWhitespaces(false);
-    
-    const auto &palettes = m_controller.palettes();
-    
     const auto &current = m_controller.current_palette();
 
     if (!current.colors().empty())
     {
-        apply_palette_to_imgui();
-        apply_palette_to_editor();
+        theme_applier::apply_to_imgui(current);
+        m_preview.apply_palette(current);
     }
     else
     {
@@ -94,6 +29,18 @@ void color_scheme_editor::notify_palette_changed()
     {
         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()
@@ -104,7 +51,8 @@ void color_scheme_editor::render_controls_and_colors()
     ImGui::Separator();
 
     ImGui::BeginChild("ColorTableContent", ImVec2(0, 0), false);
-    render_color_table();
+    m_color_table.render(m_controller.current_palette(), m_controller,
+                         [this]() { apply_themes(); });
     ImGui::EndChild();
 
     ImGui::End();
@@ -114,7 +62,7 @@ void color_scheme_editor::render_preview()
 {
     ImGui::Begin("Color Preview");
 
-    render_preview_content();
+    m_preview.render(m_controller.current_palette());
 
     ImGui::End();
 }
@@ -124,11 +72,14 @@ void color_scheme_editor::render_controls()
     const auto &current = m_controller.current_palette();
     const auto &palettes = m_controller.palettes();
 
-    const float avail_width = ImGui::GetContentRegionAvail().x;
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(6, 8));
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8, 5));
 
-    ImGui::Text("Color Scheme:");
+    ImGui::AlignTextToFramePadding();
+    ImGui::Text("Palette:");
     ImGui::SameLine();
-    ImGui::SetNextItemWidth(std::min(200.0f, avail_width * 0.3f));
+
+    ImGui::SetNextItemWidth(200.0f);
     if (ImGui::BeginCombo("##scheme", current.name().c_str()))
     {
         for (const auto &name : palettes | std::views::keys)
@@ -137,47 +88,58 @@ void color_scheme_editor::render_controls()
             if (ImGui::Selectable(name.c_str(), selected))
             {
                 m_controller.select_palette(name);
-                apply_palette_to_imgui();
-                apply_palette_to_editor();
-                notify_palette_changed();
+                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"))
+    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("New palette name:");
-        ImGui::InputText("##new_palette_input", new_palette_name_buf,
+        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)))
-        {
-            if (strlen(new_palette_name_buf) > 0)
         {
             m_controller.create_palette(new_palette_name_buf);
-                apply_palette_to_imgui();
-                apply_palette_to_editor();
-                notify_palette_changed();
             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)))
@@ -190,366 +152,53 @@ void color_scheme_editor::render_controls()
     }
 
     ImGui::SameLine();
-    if (ImGui::Button("Save"))
+    if (ImGui::Button(" Save "))
     {
         m_controller.save_current_palette();
     }
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Save current palette to file");
 
     ImGui::SameLine();
-    if (ImGui::Button("Delete"))
+    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_controller.delete_current_palette();
+        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();
-    if (ImGui::Button("Apply"))
+    ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 16);
+
+    if (ImGui::Button(" Apply Theme "))
     {
         m_controller.apply_current_theme();
     }
-}
-
-void color_scheme_editor::render_color_table()
-{
-    const auto &current = m_controller.current_palette();
-
-    if (current.colors().empty())
-    {
-        ImGui::Text("No palette loaded");
-        return;
-    }
-
-    ImGui::Text("Color Variables");
-    ImGui::Separator();
-
-    auto render_color_row = [&](const std::string &name) {
-        const auto &colors = current.colors();
-        auto it = colors.find(name);
-        if (it == colors.end())
-            return;
-
-        const clrsync::core::color &col = it->second;
-
-        ImGui::TableNextRow();
-
-        ImGui::TableSetColumnIndex(0);
-        ImGui::TextUnformatted(name.c_str());
-
-        ImGui::TableSetColumnIndex(1);
-        {
-            std::string hex_str = col.to_hex_string();
-            char buf[9];
-            strncpy(buf, hex_str.c_str(), sizeof(buf));
-            buf[8] = 0;
-
-            ImGui::SetNextItemWidth(-FLT_MIN);
-            if (ImGui::InputText(("##hex_" + name).c_str(), buf, sizeof(buf),
-                                 ImGuiInputTextFlags_CharsUppercase))
-            {
-                try
-                {
-                    clrsync::core::color new_color;
-                    new_color.from_hex_string(buf);
-                    m_controller.set_color(name, new_color);
-                    apply_palette_to_imgui();
-                    apply_palette_to_editor();
-                    notify_palette_changed();
-                }
-                catch (...)
-                {
-                }
-            }
-        }
-
-        ImGui::TableSetColumnIndex(2);
-        ImGui::PushID(name.c_str());
-        float c[4] = {((col.hex() >> 24) & 0xFF) / 255.0f, ((col.hex() >> 16) & 0xFF) / 255.0f,
-                      ((col.hex() >> 8) & 0xFF) / 255.0f, (col.hex() & 0xFF) / 255.0f};
-
-        ImGui::SetNextItemWidth(-FLT_MIN);
-        if (ImGui::ColorEdit4(("##color_" + name).c_str(), c,
-                              ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel |
-                                  ImGuiColorEditFlags_AlphaBar))
-        {
-            uint32_t r = (uint32_t)(c[0] * 255.0f);
-            uint32_t g = (uint32_t)(c[1] * 255.0f);
-            uint32_t b = (uint32_t)(c[2] * 255.0f);
-            uint32_t a = (uint32_t)(c[3] * 255.0f);
-            uint32_t hex = (r << 24) | (g << 16) | (b << 8) | a;
-
-            m_controller.set_color(name, clrsync::core::color(hex));
-            apply_palette_to_imgui();
-            apply_palette_to_editor();
-            notify_palette_changed();
-        }
-
-        ImGui::PopID();
-    };
-
-    auto draw_table = [&](const char *title, const std::vector<const char *> &keys) {
-        ImGui::TextUnformatted(title);
-
-        if (ImGui::BeginTable(title, 3, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg))
-        {
-            ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 160.0f);
-            ImGui::TableSetupColumn("HEX", ImGuiTableColumnFlags_WidthFixed, 90.0f);
-            ImGui::TableSetupColumn("Preview", ImGuiTableColumnFlags_WidthStretch);
-            ImGui::TableHeadersRow();
-
-            for (auto *k : keys)
-                render_color_row(k);
-
-            ImGui::EndTable();
-        }
-
-        ImGui::Spacing();
-    };
-
-    draw_table("General UI", {"background", "on_background", "surface", "on_surface",
-                              "surface_variant", "on_surface_varuant", "foreground",
-                              "cursor", "accent"});
-
-    draw_table("Borders", {"border_focused", "border"});
-
-    draw_table("Semantic Colors", {"success", "info", "warning", "error",
-                                   "on_success", "on_info", "on_warning", "on_error"});
-
-    draw_table("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)", {"base00", "base01", "base02", "base03",
-                                     "base04", "base05", "base06", "base07",
-                                     "base08", "base09", "base0A", "base0B",
-                                     "base0C", "base0D", "base0E", "base0F"});
-}
-
-void color_scheme_editor::render_preview_content()
-{
-    const auto &current = m_controller.current_palette();
-
-    if (current.colors().empty())
-    {
-        ImGui::TextColored(ImVec4(1.0f, 0.3f, 0.3f, 1.0f), "Current palette is empty");
-        return;
-    }
-
-    auto get_color = [&](const std::string &key) -> ImVec4 {
-        auto it = current.colors().find(key);
-        if (it != current.colors().end())
-        {
-            const auto &col = it->second;
-            const uint32_t hex = col.hex();
-            return {((hex >> 24) & 0xFF) / 255.0f, ((hex >> 16) & 0xFF) / 255.0f,
-                    ((hex >> 8) & 0xFF) / 255.0f, ((hex) & 0xFF) / 255.0f};
-        }
-        return {1, 1, 1, 1};
-    };
-
-    const ImVec4 editor_bg = get_color("editor_background");
-    const ImVec4 fg = get_color("foreground");
-    const ImVec4 accent = get_color("accent");
-    const ImVec4 border = get_color("border");
-    const ImVec4 error = get_color("error");
-    const ImVec4 warning = get_color("warning");
-    const ImVec4 success = get_color("success");
-    const ImVec4 info = get_color("info");
-
-    const float avail_height = ImGui::GetContentRegionAvail().y;
-    const float code_preview_height = std::max(250.0f, avail_height * 0.55f);
-
-    ImGui::Text("Code Editor:");
-
-    m_editor.Render("##CodeEditor", ImVec2(0, code_preview_height), true);
-
-    ImGui::Spacing();
-    ImGui::Text("Terminal Preview:");
-    
-    ImGui::PushStyleColor(ImGuiCol_ChildBg, editor_bg);
-    ImGui::BeginChild("TerminalPreview", ImVec2(0, 0), true);
-    ImGui::PushStyleColor(ImGuiCol_Border, border);
-
-    struct term_line
-    {
-        const char *text{};
-        ImVec4 col;
-    };
-    term_line term_lines[] = {
-        {"$ ls -la", fg},
-        {"drwxr-xr-x 5 user group 4096 Dec  2 10:30 .", accent},
-        {"Build successful", success},
-        {"Error: file not found", error},
-        {"Warning: low disk space", warning},
-        {"Info: update available", info},
-    };
-
-    for (auto &[text, col] : term_lines)
-    {
-        ImGui::TextColored(col, "%s", text);
-    }
-
-    ImGui::PopStyleColor(2);
-    ImGui::EndChild();
-}
-
-void color_scheme_editor::apply_palette_to_editor()
-{
-    const auto &current = m_controller.current_palette();
-    if (current.colors().empty())
-        return;
-
-    auto get_color_u32 = [&](const std::string &key, const std::string &fallback = "") -> uint32_t {
-        auto it = current.colors().find(key);
-        if (it == current.colors().end() && !fallback.empty())
-        {
-            it = current.colors().find(fallback);
-        }
-        
-        if (it != current.colors().end())
-        {
-            const auto &col = it->second;
-            const uint32_t hex = col.hex();
-            // Convert from RRGGBBAA to AABBGGRR (ImGui format)
-            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;
-    };
-
-    auto palette = m_editor.GetPalette();
-
-    palette[int(TextEditor::PaletteIndex::Default)] = get_color_u32("editor_main");
-    palette[int(TextEditor::PaletteIndex::Keyword)] = get_color_u32("editor_command");
-    palette[int(TextEditor::PaletteIndex::Number)] = get_color_u32("editor_warning");
-    palette[int(TextEditor::PaletteIndex::String)] = get_color_u32("editor_string");
-    palette[int(TextEditor::PaletteIndex::CharLiteral)] = get_color_u32("editor_string");
-    palette[int(TextEditor::PaletteIndex::Punctuation)] = get_color_u32("editor_main");
-    palette[int(TextEditor::PaletteIndex::Preprocessor)] = get_color_u32("editor_emphasis");
-    palette[int(TextEditor::PaletteIndex::Identifier)] = get_color_u32("editor_main");
-    palette[int(TextEditor::PaletteIndex::KnownIdentifier)] = get_color_u32("editor_link");
-    palette[int(TextEditor::PaletteIndex::PreprocIdentifier)] = get_color_u32("editor_link");
-
-    palette[int(TextEditor::PaletteIndex::Comment)] = get_color_u32("editor_comment");
-    palette[int(TextEditor::PaletteIndex::MultiLineComment)] = get_color_u32("editor_comment");
-
-    palette[int(TextEditor::PaletteIndex::Background)] = get_color_u32("editor_background");
-    palette[int(TextEditor::PaletteIndex::Cursor)] = get_color_u32("cursor");
-
-    palette[int(TextEditor::PaletteIndex::Selection)] = get_color_u32("editor_selected");
-    palette[int(TextEditor::PaletteIndex::ErrorMarker)] = get_color_u32("editor_error");
-    palette[int(TextEditor::PaletteIndex::Breakpoint)] = get_color_u32("editor_error");
-
-    palette[int(TextEditor::PaletteIndex::LineNumber)] = get_color_u32("editor_line_number");
-    palette[int(TextEditor::PaletteIndex::CurrentLineFill)] = get_color_u32("surface_variant");
-    palette[int(TextEditor::PaletteIndex::CurrentLineFillInactive)] = get_color_u32("surface");
-
-    palette[int(TextEditor::PaletteIndex::CurrentLineEdge)] = get_color_u32("border_focused");
-
-    m_editor.SetPalette(palette);
-}
-
-void color_scheme_editor::apply_palette_to_imgui() const
-{
-    const auto &current = m_controller.current_palette();
-
-    if (current.colors().empty())
-        return;
-    
-    auto getColor = [&](const std::string &key, const std::string &fallback = "") -> ImVec4 {
-        auto it = current.colors().find(key);
-        if (it == current.colors().end() && !fallback.empty())
-        {
-            it = current.colors().find(fallback);
-        }
-        
-        if (it != current.colors().end())
-        {
-            const uint32_t hex = it->second.hex();
-            return {((hex >> 24) & 0xFF) / 255.0f, ((hex >> 16) & 0xFF) / 255.0f,
-                    ((hex >> 8) & 0xFF) / 255.0f, ((hex) & 0xFF) / 255.0f};
-        }
-        
-        std::cout << "WARNING: Color key '" << key << "' not found!\n";
-        return {1, 1, 1, 1};
-    };
-
-    ImGuiStyle &style = ImGui::GetStyle();
-
-    const ImVec4 bg = getColor("background");
-    const ImVec4 surface = getColor("surface");
-    const ImVec4 surfaceVariant = getColor("surface_variant");
-    const ImVec4 fg = getColor("foreground");
-    const ImVec4 fgInactive = getColor("editor_inactive");
-    const ImVec4 accent = getColor("accent");
-    const ImVec4 border = getColor("border");
-
-    style.Colors[ImGuiCol_WindowBg] = bg;
-    style.Colors[ImGuiCol_ChildBg] = surface;
-    style.Colors[ImGuiCol_PopupBg] = surface;
-
-    style.Colors[ImGuiCol_Border] = border;
-    style.Colors[ImGuiCol_BorderShadow] = ImVec4(0, 0, 0, 0);
-
-    style.Colors[ImGuiCol_Text] = fg;
-    style.Colors[ImGuiCol_TextDisabled] = fgInactive;
-
-    style.Colors[ImGuiCol_Header] = surfaceVariant;
-    style.Colors[ImGuiCol_HeaderHovered] = ImVec4(accent.x, accent.y, accent.z, 0.8f);
-    style.Colors[ImGuiCol_HeaderActive] = accent;
-
-    style.Colors[ImGuiCol_Button] = surfaceVariant;
-    style.Colors[ImGuiCol_ButtonHovered] = ImVec4(accent.x, accent.y, accent.z, 0.6f);
-    style.Colors[ImGuiCol_ButtonActive] = accent;
-
-    style.Colors[ImGuiCol_FrameBg] = surfaceVariant;
-    style.Colors[ImGuiCol_FrameBgHovered] =
-        ImVec4(surfaceVariant.x * 1.1f, surfaceVariant.y * 1.1f, surfaceVariant.z * 1.1f, 1.0f);
-    style.Colors[ImGuiCol_FrameBgActive] =
-        ImVec4(surfaceVariant.x * 1.2f, surfaceVariant.y * 1.2f, surfaceVariant.z * 1.2f, 1.0f);
-
-    style.Colors[ImGuiCol_TitleBg] = surface;
-    style.Colors[ImGuiCol_TitleBgActive] = surfaceVariant;
-    style.Colors[ImGuiCol_TitleBgCollapsed] = surface;
-
-    style.Colors[ImGuiCol_ScrollbarBg] = surface;
-    style.Colors[ImGuiCol_ScrollbarGrab] = surfaceVariant;
-    style.Colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(accent.x, accent.y, accent.z, 0.6f);
-    style.Colors[ImGuiCol_ScrollbarGrabActive] = accent;
-
-    style.Colors[ImGuiCol_SliderGrab] = accent;
-    style.Colors[ImGuiCol_SliderGrabActive] =
-        ImVec4(accent.x * 1.2f, accent.y * 1.2f, accent.z * 1.2f, 1.0f);
-
-    style.Colors[ImGuiCol_CheckMark] = accent;
-    style.Colors[ImGuiCol_ResizeGrip] = surfaceVariant;
-    style.Colors[ImGuiCol_ResizeGripHovered] = ImVec4(accent.x, accent.y, accent.z, 0.6f);
-    style.Colors[ImGuiCol_ResizeGripActive] = accent;
-
-    style.Colors[ImGuiCol_Tab] = surface;
-    style.Colors[ImGuiCol_TabHovered] = ImVec4(accent.x, accent.y, accent.z, 0.8f);
-    style.Colors[ImGuiCol_TabActive] = surfaceVariant;
-    style.Colors[ImGuiCol_TabUnfocused] = surface;
-    style.Colors[ImGuiCol_TabUnfocusedActive] = surfaceVariant;
-    style.Colors[ImGuiCol_TabSelectedOverline] = accent;
-
-    style.Colors[ImGuiCol_TableHeaderBg] = surfaceVariant;
-    style.Colors[ImGuiCol_TableBorderStrong] = border;
-    style.Colors[ImGuiCol_TableBorderLight] =
-        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(fg.x, fg.y, fg.z, 0.06f);
-
-    style.Colors[ImGuiCol_Separator] = border;
-    style.Colors[ImGuiCol_SeparatorHovered] = accent;
-    style.Colors[ImGuiCol_SeparatorActive] = accent;
-
-    style.Colors[ImGuiCol_MenuBarBg] = surface;
-
-    style.Colors[ImGuiCol_DockingPreview] = ImVec4(accent.x, accent.y, accent.z, 0.7f);
-    style.Colors[ImGuiCol_DockingEmptyBg] = bg;
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Apply current palette to all enabled templates");
+
+    ImGui::PopStyleVar(2);
 }

src/gui/color_scheme_editor.hpp

@@ -1,10 +1,12 @@
 #ifndef CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
 #define CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
 
-#include "color_text_edit/TextEditor.h"
 #include "palette_controller.hpp"
+#include "color_table_renderer.hpp"
+#include "preview_renderer.hpp"
 
 class template_editor;
+class settings_window;
 
 class color_scheme_editor
 {
@@ -14,20 +16,20 @@ public:
     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 render_color_table();
-    void render_preview_content();
-    
-    void apply_palette_to_editor();
-    void apply_palette_to_imgui() const;
+    void apply_themes();
     void notify_palette_changed();
 
     palette_controller m_controller;
-    TextEditor m_editor;
+    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

src/gui/color_table_renderer.cpp

@@ -0,0 +1,208 @@
+#include "color_table_renderer.hpp"
+#include "imgui_helpers.hpp"
+#include "imgui.h"
+#include <algorithm>
+#include <cctype>
+#include <vector>
+
+bool color_table_renderer::matches_filter(const std::string& name) const
+{
+    if (m_filter_text[0] == '\0')
+        return true;
+    
+    std::string filter_lower = m_filter_text;
+    std::string name_lower = name;
+    
+    std::transform(filter_lower.begin(), filter_lower.end(), filter_lower.begin(),
+                   [](unsigned char c) { return std::tolower(c); });
+    std::transform(name_lower.begin(), name_lower.end(), name_lower.begin(),
+                   [](unsigned char c) { return std::tolower(c); });
+    
+    return name_lower.find(filter_lower) != std::string::npos;
+}
+
+void color_table_renderer::render_color_row(const std::string &name,
+                                            const clrsync::core::palette& current,
+                                            palette_controller& controller,
+                                            const OnColorChangedCallback& on_changed)
+{
+    if (!matches_filter(name))
+        return;
+    
+    const clrsync::core::color &col = current.get_color(name);
+
+    ImGui::TableNextRow();
+
+    ImGui::TableSetColumnIndex(0);
+    const float key_col_width = ImGui::GetContentRegionAvail().x;
+    
+    ImVec4 text_color = palette_utils::get_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();
+    
+    if (ImGui::IsItemHovered())
+    {
+        ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
+        ImGui::SetTooltip("Click to copy: {%s.hex}", name.c_str());
+    }
+    if (copied)
+    {
+        std::string template_var = "{" + name + ".hex}";
+        ImGui::SetClipboardText(template_var.c_str());
+    }
+
+    ImGui::TableSetColumnIndex(1);
+    {
+        std::string hex_str = col.to_hex_string();
+        char buf[9];
+        strncpy(buf, hex_str.c_str(), sizeof(buf));
+        buf[8] = 0;
+
+        ImGui::SetNextItemWidth(-FLT_MIN);
+        if (ImGui::InputText(("##hex_" + name).c_str(), buf, sizeof(buf),
+                             ImGuiInputTextFlags_CharsUppercase))
+        {
+            try
+            {
+                clrsync::core::color new_color;
+                new_color.from_hex_string(buf);
+                controller.set_color(name, new_color);
+                if (on_changed)
+                    on_changed();
+            }
+            catch (...)
+            {
+            }
+        }
+    }
+
+    ImGui::TableSetColumnIndex(2);
+    ImGui::PushID(name.c_str());
+    float c[4] = {((col.hex() >> 24) & 0xFF) / 255.0f, ((col.hex() >> 16) & 0xFF) / 255.0f,
+                  ((col.hex() >> 8) & 0xFF) / 255.0f, (col.hex() & 0xFF) / 255.0f};
+
+    ImGui::SetNextItemWidth(-FLT_MIN);
+    if (ImGui::ColorEdit4(("##color_" + name).c_str(), c,
+                          ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel |
+                              ImGuiColorEditFlags_AlphaBar | ImGuiColorEditFlags_AlphaPreviewHalf))
+    {
+        uint32_t r = (uint32_t)(c[0] * 255.0f);
+        uint32_t g = (uint32_t)(c[1] * 255.0f);
+        uint32_t b = (uint32_t)(c[2] * 255.0f);
+        uint32_t a = (uint32_t)(c[3] * 255.0f);
+        uint32_t hex = (r << 24) | (g << 16) | (b << 8) | a;
+
+        controller.set_color(name, clrsync::core::color(hex));
+        if (on_changed)
+            on_changed();
+    }
+
+    ImGui::PopID();
+}
+
+void color_table_renderer::render(const clrsync::core::palette& current,
+                                  palette_controller& controller,
+                                  const OnColorChangedCallback& on_changed)
+{
+    if (current.colors().empty())
+    {
+        ImGui::TextColored(ImVec4(1.0f, 0.6f, 0.4f, 1.0f), "No palette loaded");
+        return;
+    }
+
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8, 6));
+    
+    ImGui::Text("Filter:");
+    ImGui::SameLine();
+    ImGui::SetNextItemWidth(200);
+    bool filter_changed = ImGui::InputTextWithHint("##color_filter", "Search colors...", 
+                                                    m_filter_text, sizeof(m_filter_text));
+    
+    if (m_filter_text[0] != '\0')
+    {
+        ImGui::SameLine();
+        if (ImGui::SmallButton("X"))
+        {
+            m_filter_text[0] = '\0';
+            filter_changed = true;
+        }
+        if (ImGui::IsItemHovered())
+            ImGui::SetTooltip("Clear filter");
+    }
+    
+    ImGui::SameLine();
+    ImGui::TextDisabled("(?)");
+    if (ImGui::IsItemHovered())
+    {
+        ImGui::BeginTooltip();
+        ImGui::TextUnformatted("Click on a color name to copy its template variable");
+        ImGui::TextUnformatted("Example: clicking 'background' copies {background.hex}");
+        ImGui::EndTooltip();
+    }
+    
+    ImGui::PopStyleVar();
+    
+    ImGui::Spacing();
+    ImGui::Separator();
+    ImGui::Spacing();
+
+    auto draw_table = [&](const char *title, const char* id, const std::vector<const char *> &keys) {
+        bool has_matches = false;
+        for (auto *k : keys)
+        {
+            if (matches_filter(k))
+            {
+                has_matches = true;
+                break;
+            }
+        }
+        
+        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::PopStyleColor();
+        
+        if (header_open)
+        {
+            if (ImGui::BeginTable(id, 3, 
+                ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingStretchProp))
+            {
+                ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 160.0f);
+                ImGui::TableSetupColumn("HEX", ImGuiTableColumnFlags_WidthFixed, 95.0f);
+                ImGui::TableSetupColumn("Color", ImGuiTableColumnFlags_WidthStretch);
+                ImGui::TableHeadersRow();
+
+                for (auto *k : keys)
+                    render_color_row(k, current, controller, on_changed);
+
+                ImGui::EndTable();
+            }
+            ImGui::TreePop();
+        }
+
+        ImGui::Spacing();
+    };
+
+    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("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"});
+}

src/gui/color_table_renderer.hpp

@@ -0,0 +1,30 @@
+#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

src/gui/file_browser.cpp

@@ -0,0 +1,338 @@
+#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 "";
+}
+
+}
+
+#else
+
+#ifdef __APPLE__
+#include <Cocoa/Cocoa.h>
+
+namespace file_dialogs {
+
+std::string open_file_dialog(const std::string& title, 
+                             const std::string& initial_path,
+                             const std::vector<std::string>& filters) {
+    @autoreleasepool {
+        NSOpenPanel* panel = [NSOpenPanel openPanel];
+        [panel setTitle:[NSString stringWithUTF8String:title.c_str()]];
+        [panel setCanChooseFiles:YES];
+        [panel setCanChooseDirectories:NO];
+        [panel setAllowsMultipleSelection:NO];
+        
+        if (!initial_path.empty()) {
+            NSURL* url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:initial_path.c_str()]];
+            [panel setDirectoryURL:url];
+        }
+        
+        if ([panel runModal] == NSModalResponseOK) {
+            NSURL* url = [[panel URLs] objectAtIndex:0];
+            return std::string([[url path] UTF8String]);
+        }
+    }
+    return "";
+}
+
+std::string save_file_dialog(const std::string& title,
+                             const std::string& initial_path,
+                             const std::vector<std::string>& filters) {
+    @autoreleasepool {
+        NSSavePanel* panel = [NSSavePanel savePanel];
+        [panel setTitle:[NSString stringWithUTF8String:title.c_str()]];
+        
+        if (!initial_path.empty()) {
+            std::filesystem::path p(initial_path);
+            if (std::filesystem::exists(p.parent_path())) {
+                NSURL* url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:p.parent_path().c_str()]];
+                [panel setDirectoryURL:url];
+                [panel setNameFieldStringValue:[NSString stringWithUTF8String:p.filename().c_str()]];
+            }
+        }
+        
+        if ([panel runModal] == NSModalResponseOK) {
+            NSURL* url = [panel URL];
+            return std::string([[url path] UTF8String]);
+        }
+    }
+    return "";
+}
+
+std::string select_folder_dialog(const std::string& title,
+                                 const std::string& initial_path) {
+    @autoreleasepool {
+        NSOpenPanel* panel = [NSOpenPanel openPanel];
+        [panel setTitle:[NSString stringWithUTF8String:title.c_str()]];
+        [panel setCanChooseFiles:NO];
+        [panel setCanChooseDirectories:YES];
+        [panel setAllowsMultipleSelection:NO];
+        
+        if (!initial_path.empty()) {
+            NSURL* url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:initial_path.c_str()]];
+            [panel setDirectoryURL:url];
+        }
+        
+        if ([panel runModal] == NSModalResponseOK) {
+            NSURL* url = [[panel URLs] objectAtIndex:0];
+            return std::string([[url path] UTF8String]);
+        }
+    }
+    return "";
+}
+
+}
+
+#else
+
+#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 "";
+    }
+    
+    GtkWidget* dialog = gtk_file_chooser_dialog_new(
+        title.c_str(),
+        nullptr,
+        GTK_FILE_CHOOSER_ACTION_OPEN,
+        "Cancel", GTK_RESPONSE_CANCEL,
+        "Open", GTK_RESPONSE_ACCEPT,
+        nullptr);
+    
+    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(GTK_FILE_CHOOSER(dialog), initial_path.c_str());
+            } else {
+                gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), p.parent_path().c_str());
+                gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), p.filename().c_str());
+            }
+        }
+    }
+    
+    std::string result;
+    if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+        char* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+        if (filename) {
+            result = filename;
+            g_free(filename);
+        }
+    }
+    
+    gtk_widget_destroy(dialog);
+    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 "";
+    }
+    
+    GtkWidget* dialog = gtk_file_chooser_dialog_new(
+        title.c_str(),
+        nullptr,
+        GTK_FILE_CHOOSER_ACTION_SAVE,
+        "Cancel", GTK_RESPONSE_CANCEL,
+        "Save", GTK_RESPONSE_ACCEPT,
+        nullptr);
+    
+    gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE);
+    
+    if (!initial_path.empty()) {
+        std::filesystem::path p(initial_path);
+        if (std::filesystem::exists(p.parent_path())) {
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), p.parent_path().c_str());
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), p.filename().c_str());
+        }
+    }
+    
+    std::string result;
+    if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+        char* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+        if (filename) {
+            result = filename;
+            g_free(filename);
+        }
+    }
+    
+    gtk_widget_destroy(dialog);
+    return result;
+}
+
+std::string select_folder_dialog(const std::string& title,
+                                 const std::string& initial_path) {
+    if (!gtk_init_check(nullptr, nullptr)) {
+        return "";
+    }
+    
+    GtkWidget* dialog = gtk_file_chooser_dialog_new(
+        title.c_str(),
+        nullptr,
+        GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+        "Cancel", GTK_RESPONSE_CANCEL,
+        "Select", GTK_RESPONSE_ACCEPT,
+        nullptr);
+    
+    if (!initial_path.empty() && std::filesystem::exists(initial_path)) {
+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), initial_path.c_str());
+    }
+    
+    std::string result;
+    if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+        char* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+        if (filename) {
+            result = filename;
+            g_free(filename);
+        }
+    }
+    
+    gtk_widget_destroy(dialog);
+    return result;
+}
+
+}
+
+#endif
+
+#endif

src/gui/file_browser.hpp

@@ -0,0 +1,20 @@
+#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

src/gui/font_loader.cpp

@@ -41,7 +41,12 @@ static std::string search_registry_for_font(HKEY root_key, const char* subkey, c
         std::string reg_font_name = value_name;
         std::transform(reg_font_name.begin(), reg_font_name.end(), reg_font_name.begin(), ::tolower);
 
-        if (reg_font_name.find(font_name_lower) != std::string::npos)
+        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);
 
@@ -226,3 +231,101 @@ 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;
+}

src/gui/font_loader.hpp

@@ -10,11 +10,12 @@ class font_loader
 public:
     font_loader() = default;
 
-    // Loads system font by name and returns an ImFont* or nullptr.
     ImFont* load_font(const char* font_name, float size_px);
     void push_default_font();
     void pop_font();
     
+    std::vector<std::string> get_system_fonts();
+
 private:
     std::string find_font_path(const char* font_name);
 

src/gui/imgui_helpers.cpp

@@ -1,3 +1,4 @@
+#include <iostream>
 #include <string>
 
 #include "GLFW/glfw3.h"
@@ -11,14 +12,26 @@
 
 GLFWwindow * init_glfw()
 {
-    if (!glfwInit()) return nullptr;
+    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);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
     glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
 
     GLFWwindow* w = glfwCreateWindow(1280, 720, "clrsync", nullptr, nullptr);
-    if (!w) return nullptr;
+    if (!w)
+    {
+        std::cerr << "Failed to create GLFW window\n";
+        return nullptr;
+    }
 
     glfwMakeContextCurrent(w);
     glfwSwapInterval(1);
@@ -60,7 +73,6 @@ void render_menu_bar(about_window* about, settings_window* settings)
             ImGui::Separator();
             if (ImGui::MenuItem("Exit"))
             {
-                // Will be handled by checking window should close
                 glfwSetWindowShouldClose(glfwGetCurrentContext(), GLFW_TRUE);
             }
             ImGui::EndMenu();
@@ -152,3 +164,95 @@ void shutdown(GLFWwindow* window)
     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;
+}
+
+}

src/gui/imgui_helpers.hpp

@@ -2,6 +2,9 @@
 #define CLRSYNC_IMGUI_HELPERS_HPP
 
 #include "gui/about_window.hpp"
+#include "core/palette/palette.hpp"
+#include "imgui.h"
+#include <functional>
 #include <string>
 
 struct GLFWwindow;
@@ -15,4 +18,20 @@ 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

src/gui/main.cpp

@@ -1,10 +1,13 @@
 #include <memory>
 
 #include <GLFW/glfw3.h>
+#include <GLFW/glfw3native.h>
+
 
 #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"
@@ -18,7 +21,14 @@ int main(int, char**)
 {
     auto config_path = clrsync::core::get_default_config_path();
     auto conf = std::make_unique<clrsync::core::io::toml_file>(config_path);
-    clrsync::core::config::instance().initialize(std::move(conf));
+    
+    auto init_result = clrsync::core::config::instance().initialize(std::move(conf));
+    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;
+        return 1;
+    }
 
     std::filesystem::path base = config_path;
     static std::string ini_path = (base.parent_path() / "layout.ini").string();
@@ -27,6 +37,18 @@ int main(int, char**)
     GLFWwindow* window = init_glfw();
     if (!window) return 1;
 
+    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";
+    }
+
+
     init_imgui(window, ini_path);
 
     font_loader loader;
@@ -43,7 +65,9 @@ int main(int, char**)
     settings_window settingsWindow;
     
     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))
     {
@@ -56,7 +80,7 @@ int main(int, char**)
         colorEditor.render_controls_and_colors();
         colorEditor.render_preview();
         templateEditor.render();
-        aboutWindow.render();
+        aboutWindow.render(colorEditor.controller().current_palette());
         settingsWindow.render();
 
         loader.pop_font();

src/gui/palette_controller.cpp

@@ -11,9 +11,11 @@ palette_controller::palette_controller()
     if (m_palettes.empty())
         return;
     
-    try {
-        m_current_palette = m_palettes[clrsync::core::config::instance().default_theme()];
-    } catch (...) {
+    auto default_theme = clrsync::core::config::instance().default_theme();
+    auto it = m_palettes.find(default_theme);
+    if (it != m_palettes.end()) {
+        m_current_palette = it->second;
+    } else {
         m_current_palette = m_palettes.begin()->second;
     }
 }
@@ -28,8 +30,12 @@ void palette_controller::select_palette(const std::string& name)
 
 void palette_controller::create_palette(const std::string& name)
 {
-    clrsync::core::palette new_palette = m_palette_manager.load_palette_from_file(clrsync::core::config::get_data_dir().string() + "/palettes/cursed.toml");
-    new_palette.set_name(name);
+    clrsync::core::palette new_palette(name);
+    
+    for (const auto& [key, hex_value] : clrsync::core::DEFAULT_COLORS)
+    {
+        new_palette.set_color(key, clrsync::core::color(hex_value));
+    }
         
     auto dir = clrsync::core::config::instance().palettes_path();
     m_palette_manager.save_palette_to_file(new_palette, dir);
@@ -54,7 +60,7 @@ void palette_controller::delete_current_palette()
 void palette_controller::apply_current_theme() const
 {
     clrsync::core::theme_renderer<clrsync::core::io::toml_file> theme_renderer;
-    theme_renderer.apply_theme(m_current_palette.name());
+    (void)theme_renderer.apply_theme(m_current_palette.name());
 }
 
 void palette_controller::set_color(const std::string& key, const clrsync::core::color& color)

src/gui/preview_renderer.cpp

@@ -0,0 +1,145 @@
+#include "preview_renderer.hpp"
+#include "theme_applier.hpp"
+#include "imgui.h"
+#include <algorithm>
+
+preview_renderer::preview_renderer()
+{
+    m_editor.SetLanguageDefinition(TextEditor::LanguageDefinition::CPlusPlus());
+    m_editor.SetText(R"(#include <iostream>
+#include <string>
+#include <vector>
+#include <filesystem>
+#include <cstdlib>
+
+namespace fs = std::filesystem;
+
+std::string expand_user(const std::string &path)
+{
+    if (path.empty()) return "";
+
+    std::string result;
+    if (path[0] == '~')
+    {
+#ifdef _WIN32
+        const char* home = std::getenv("USERPROFILE");
+#else
+        const char* home = std::getenv("HOME");
+#endif
+        result = home ? std::string(home) : "~";
+        result += path.substr(1);
+    }
+    else
+    {
+        result = path;
+    }
+
+    return result;
+}
+
+std::vector<std::string> list_files(const std::string &dir_path)
+{
+    std::vector<std::string> files;
+    try
+    {
+        for (const auto &entry : fs::directory_iterator(dir_path))
+        {
+            if (entry.is_regular_file())
+                files.push_back(entry.path().string());
+        }
+    }
+    catch (const std::exception &e)
+    {
+        std::cerr << "Error: " << e.what() << std::endl;
+    }
+    return files;
+}
+
+int main()
+{
+    std::string path = expand_user("~/Documents");
+    std::cout << "Listing files in: " << path << std::endl;
+
+    auto files = list_files(path);
+    for (const auto &f : files)
+        std::cout << "  " << f << std::endl;
+
+    return 0;
+})");
+
+    m_editor.SetShowWhitespaces(false);
+}
+
+void preview_renderer::apply_palette(const clrsync::core::palette& palette)
+{
+    theme_applier::apply_to_editor(m_editor, palette);
+}
+
+void preview_renderer::render_code_preview()
+{
+    const float avail_height = ImGui::GetContentRegionAvail().y;
+    const float code_preview_height = std::max(250.0f, avail_height * 0.55f);
+
+    ImGui::Text("Code Editor:");
+    m_editor.Render("##CodeEditor", ImVec2(0, code_preview_height), true);
+}
+
+void preview_renderer::render_terminal_preview(const clrsync::core::palette& current)
+{
+    auto get_color = [&](const std::string &key) -> ImVec4 {
+        const auto &col = current.get_color(key);
+        const uint32_t hex = col.hex();
+        return {((hex >> 24) & 0xFF) / 255.0f, ((hex >> 16) & 0xFF) / 255.0f,
+                ((hex >> 8) & 0xFF) / 255.0f, ((hex) & 0xFF) / 255.0f};
+    };
+
+    const ImVec4 editor_bg = get_color("editor_background");
+    const ImVec4 fg = get_color("foreground");
+    const ImVec4 accent = get_color("accent");
+    const ImVec4 border = get_color("border");
+    const ImVec4 error = get_color("error");
+    const ImVec4 warning = get_color("warning");
+    const ImVec4 success = get_color("success");
+    const ImVec4 info = get_color("info");
+
+    ImGui::Spacing();
+    ImGui::Text("Terminal Preview:");
+    
+    ImGui::PushStyleColor(ImGuiCol_ChildBg, editor_bg);
+    ImGui::BeginChild("TerminalPreview", ImVec2(0, 0), true);
+    ImGui::PushStyleColor(ImGuiCol_Border, border);
+
+    struct term_line
+    {
+        const char *text{};
+        ImVec4 col;
+    };
+    term_line term_lines[] = {
+        {"$ ls -la", fg},
+        {"drwxr-xr-x 5 user group 4096 Dec  2 10:30 .", accent},
+        {"Build successful", success},
+        {"Error: file not found", error},
+        {"Warning: low disk space", warning},
+        {"Info: update available", info},
+    };
+
+    for (auto &[text, col] : term_lines)
+    {
+        ImGui::TextColored(col, "%s", text);
+    }
+
+    ImGui::PopStyleColor(2);
+    ImGui::EndChild();
+}
+
+void preview_renderer::render(const clrsync::core::palette& current)
+{
+    if (current.colors().empty())
+    {
+        ImGui::TextColored(ImVec4(1.0f, 0.3f, 0.3f, 1.0f), "Current palette is empty");
+        return;
+    }
+
+    render_code_preview();
+    render_terminal_preview(current);
+}

src/gui/preview_renderer.hpp

@@ -0,0 +1,22 @@
+#ifndef CLRSYNC_GUI_PREVIEW_RENDERER_HPP
+#define CLRSYNC_GUI_PREVIEW_RENDERER_HPP
+
+#include "core/palette/palette.hpp"
+#include "color_text_edit/TextEditor.h"
+
+class preview_renderer
+{
+public:
+    preview_renderer();
+    
+    void render(const clrsync::core::palette& palette);
+    void apply_palette(const clrsync::core::palette& palette);
+
+private:
+    void render_code_preview();
+    void render_terminal_preview(const clrsync::core::palette& palette);
+    
+    TextEditor m_editor;
+};
+
+#endif // CLRSYNC_GUI_PREVIEW_RENDERER_HPP

src/gui/settings_window.cpp

@@ -1,15 +1,22 @@
 #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_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();
 }
 
@@ -18,109 +25,39 @@ void settings_window::render()
     if (!m_visible)
         return;
 
-    ImGui::SetNextWindowSize(ImVec2(600, 400), ImGuiCond_FirstUseEver);
+    ImGui::SetNextWindowSize(ImVec2(700, 500), ImGuiCond_FirstUseEver);
+    ImGui::SetNextWindowPos(ImGui::GetMainViewport()->GetCenter(), ImGuiCond_FirstUseEver, ImVec2(0.5f, 0.5f));
     
-    if (ImGui::Begin("Settings", &m_visible))
+    ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoCollapse;
+    if (ImGui::Begin("Settings", &m_visible, window_flags))
     {
-        ImGui::Text("General Settings");
-        ImGui::Separator();
-        ImGui::Spacing();
-        
-        ImGui::Text("Default Theme:");
-        ImGui::SameLine();
-        ImGui::SetNextItemWidth(300.0f);
-        ImGui::InputText("##default_theme", m_default_theme, sizeof(m_default_theme));
-        if (ImGui::IsItemHovered())
+        if (ImGui::BeginTabBar("SettingsTabs", ImGuiTabBarFlags_None))
         {
-            ImGui::SetTooltip("The default color scheme to load on startup");
+            if (ImGui::BeginTabItem("General"))
+            {
+                render_general_tab();
+                ImGui::EndTabItem();
             }
             
-        ImGui::Spacing();
-        
-        ImGui::Text("Palettes Path:");
-        ImGui::SetNextItemWidth(-FLT_MIN);
-        ImGui::InputText("##palettes_path", m_palettes_path, sizeof(m_palettes_path));
-        if (ImGui::IsItemHovered())
+            if (ImGui::BeginTabItem("Appearance"))
             {
-            ImGui::SetTooltip("Directory where color palettes are stored\nSupports ~ for home directory");
+                render_appearance_tab();
+                ImGui::EndTabItem();
             }
             
-        ImGui::Spacing();
-        
-        ImGui::Text("Font:");
-        ImGui::SameLine();
-        ImGui::SetNextItemWidth(300.0f);
-        ImGui::InputText("##font", m_font, sizeof(m_font));
-        if (ImGui::IsItemHovered())
-        {
-            ImGui::SetTooltip("Font");
+            ImGui::EndTabBar();
         }
         
-        ImGui::Spacing();
-        
-        ImGui::Text("Font Size:");
-        ImGui::SameLine();
-        ImGui::SetNextItemWidth(100.0f);
-        ImGui::InputInt("##font_size", &m_font_size, 1, 1);
-        if (m_font_size < 8) m_font_size = 8;
-        if (m_font_size > 48) m_font_size = 48;
-        if (ImGui::IsItemHovered())
-        {
-            ImGui::SetTooltip("Font size");
-        }
-        
-        ImGui::Spacing();
-        ImGui::Spacing();
-        
-        if (!m_error_message.empty())
-        {
-            ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.3f, 0.3f, 1.0f));
-            ImGui::TextWrapped("%s", m_error_message.c_str());
-            ImGui::PopStyleColor();
-            ImGui::Spacing();
-        }
+        render_status_messages();
         
         ImGui::Separator();
-        ImGui::Spacing();
-        
-        if (ImGui::Button("OK", ImVec2(120, 0)))
-        {
-            apply_settings();
-            m_visible = false;
-            m_error_message = "";
-        }
-        
-        ImGui::SameLine();
-        if (ImGui::Button("Apply", ImVec2(120, 0)))
-        {
-            apply_settings();
-        }
-        
-        ImGui::SameLine();
-        if (ImGui::Button("Reset to Defaults", ImVec2(150, 0)))
-        {
-            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 = "";
-        }
-        
-        ImGui::SameLine();
-        if (ImGui::Button("Cancel", ImVec2(120, 0)))
-        {
-            load_settings();
-            m_visible = false;
-            m_error_message = "";
-        }
+        render_action_buttons();
     }
     ImGui::End();
 }
 
 void settings_window::load_settings()
 {
-    try
-    {
     auto& cfg = clrsync::core::config::instance();
     
     std::string default_theme = cfg.default_theme();
@@ -135,26 +72,24 @@ void settings_window::load_settings()
     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 = "";
-    }
-    catch (const std::exception& e)
-    {
-        m_error_message = std::string("Failed to load settings: ") + e.what();
-        
-        // Set defaults on error
-        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 = false;
 }
 
 void settings_window::apply_settings()
 {
-    try
-    {
     auto& cfg = clrsync::core::config::instance();
     
     if (strlen(m_default_theme) == 0)
@@ -181,21 +116,231 @@ void settings_window::apply_settings()
         return;
     }
     
-        cfg.set_default_theme(m_default_theme);
-        cfg.set_palettes_path(m_palettes_path);
-        cfg.set_font(m_font);
-        cfg.set_font_size(m_font_size);
+    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 = "";
-    }
-    catch (const std::exception& e)
+    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"))
     {
-        m_error_message = std::string("Failed to apply settings: ") + e.what();
+        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_color = palette_utils::get_color(m_current_palette, "error");
+        ImGui::PushStyleColor(ImGuiCol_Text, error_color);
+        ImGui::TextWrapped("Error: %s", m_error_message.c_str());
+        ImGui::PopStyleColor();
+        if (ImGui::Button("Dismiss##error"))
+            m_error_message.clear();
+    }
+}
+
+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;
+}

src/gui/settings_window.hpp

@@ -1,7 +1,9 @@
 #ifndef CLRSYNC_GUI_SETTINGS_WINDOW_HPP
 #define CLRSYNC_GUI_SETTINGS_WINDOW_HPP
 
+#include "core/palette/palette.hpp"
 #include <string>
+#include <vector>
 
 class settings_window
 {
@@ -16,6 +18,17 @@ 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};
     
@@ -24,7 +37,14 @@ private:
     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

src/gui/template_controller.cpp

@@ -11,7 +11,16 @@ void template_controller::set_template_enabled(const std::string& key, bool enab
     auto it = m_templates.find(key);
     if (it != m_templates.end()) {
         it->second.set_enabled(enabled);
-        clrsync::core::config::instance().update_template(key, it->second);
+        (void)clrsync::core::config::instance().update_template(key, it->second);
+    }
+}
+
+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()) {
+        it->second.set_template_path(path);
+        (void)clrsync::core::config::instance().update_template(key, it->second);
     }
 }
 
@@ -20,7 +29,7 @@ void template_controller::set_template_output_path(const std::string& key, const
     auto it = m_templates.find(key);
     if (it != m_templates.end()) {
         it->second.set_output_path(path);
-        clrsync::core::config::instance().update_template(key, it->second);
+        (void)clrsync::core::config::instance().update_template(key, it->second);
     }
 }
 
@@ -29,10 +38,20 @@ void template_controller::set_template_reload_command(const std::string& key, co
     auto it = m_templates.find(key);
     if (it != m_templates.end()) {
         it->second.set_reload_command(cmd);
-        clrsync::core::config::instance().update_template(key, it->second);
+        (void)clrsync::core::config::instance().update_template(key, it->second);
     }
 }
 
+bool template_controller::remove_template(const std::string& key)
+{
+    auto result = clrsync::core::config::instance().remove_template(key);
+    if (result) {
+        m_templates.erase(key);
+        return true;
+    }
+    return false;
+}
+
 void template_controller::refresh()
 {
     m_templates = m_template_manager.templates();

src/gui/template_controller.hpp

@@ -12,8 +12,10 @@ public:
     template_controller();
     [[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);
     void set_template_reload_command(const std::string& key, const std::string& cmd);
+    bool remove_template(const std::string& key);
     void refresh();
     
 private:

src/gui/template_editor.cpp

@@ -1,13 +1,35 @@
 #include "template_editor.hpp"
 #include "core/config/config.hpp"
 #include "core/theme/theme_template.hpp"
+#include "core/palette/color_keys.hpp"
+#include "core/utils.hpp"
+#include "imgui_helpers.hpp"
+#include "file_browser.hpp"
 #include "imgui.h"
+#include <algorithm>
 #include <filesystem>
 #include <fstream>
 #include <ranges>
 
+namespace {
+    const std::vector<std::string> COLOR_FORMATS = {
+        "hex", "hex_stripped", "hexa", "hexa_stripped",
+        "r", "g", "b", "a",
+        "rgb", "rgba",
+        "h", "s", "l",
+        "hsl", "hsla"
+    };
+}
+
 template_editor::template_editor() : m_template_name("new_template")
 {
+    m_autocomplete_bg_color = ImVec4(0.12f, 0.12f, 0.15f, 0.98f);
+    m_autocomplete_border_color = ImVec4(0.4f, 0.4f, 0.45f, 1.0f);
+    m_autocomplete_selected_color = ImVec4(0.25f, 0.45f, 0.75f, 0.9f);
+    m_autocomplete_text_color = ImVec4(0.85f, 0.85f, 0.9f, 1.0f);
+    m_autocomplete_selected_text_color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+    m_autocomplete_dim_text_color = ImVec4(0.6f, 0.6f, 0.7f, 1.0f);
+    
     TextEditor::LanguageDefinition lang;
     lang.mName = "Template";
 
@@ -32,28 +54,12 @@ template_editor::template_editor() : m_template_name("new_template")
 
 void template_editor::apply_current_palette(const clrsync::core::palette &pal)
 {
+    m_current_palette = pal;
     auto colors = pal.colors();
     if (colors.empty())
         return;
     auto get_color_u32 = [&](const std::string &key, const std::string &fallback = "") -> uint32_t {
-        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();
-            // Convert from RRGGBBAA to AABBGGRR (ImGui format)
-            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;
+        return palette_utils::get_color_u32(pal, key, fallback);
     };
 
     auto palette = m_editor.GetPalette();
@@ -95,6 +101,237 @@ void template_editor::apply_current_palette(const clrsync::core::palette &pal)
         get_color_u32("border_focused", "border");
 
     m_editor.SetPalette(palette);
+    
+    m_autocomplete_bg_color = palette_utils::get_color(pal, "editor_background", "background");
+    m_autocomplete_bg_color.w = 0.98f;
+    m_autocomplete_border_color = palette_utils::get_color(pal, "border", "editor_inactive");
+    m_autocomplete_selected_color = palette_utils::get_color(pal, "editor_selected", "surface_variant");
+    m_autocomplete_text_color = palette_utils::get_color(pal, "editor_main", "foreground");
+    m_autocomplete_selected_text_color = palette_utils::get_color(pal, "foreground", "editor_main");
+    m_autocomplete_dim_text_color = palette_utils::get_color(pal, "editor_comment", "editor_inactive");
+}
+
+void template_editor::update_autocomplete_suggestions()
+{
+    m_autocomplete_suggestions.clear();
+    
+    auto cursor = m_editor.GetCursorPosition();
+    std::string line = m_editor.GetCurrentLineText();
+    int col = cursor.mColumn;
+    
+    // Check if inside '{'
+    int brace_pos = -1;
+    for (int i = col - 1; i >= 0; --i)
+    {
+        if (i < (int)line.length())
+        {
+            if (line[i] == '{')
+            {
+                brace_pos = i;
+                break;
+            }
+            else if (line[i] == '}' || line[i] == ' ' || line[i] == '\t')
+            {
+                break;
+            }
+        }
+    }
+    
+    if (brace_pos < 0)
+    {
+        m_show_autocomplete = false;
+        m_autocomplete_dismissed = false; 
+        return;
+    }
+    
+    if (m_autocomplete_dismissed)
+    {
+        bool should_reset_dismissal = false;
+        
+        if (cursor.mLine != m_dismiss_position.mLine ||
+            brace_pos != m_dismiss_brace_pos ||
+            abs(cursor.mColumn - m_dismiss_position.mColumn) > 3)
+        {
+            should_reset_dismissal = true;
+        }
+        
+        if (should_reset_dismissal)
+        {
+            m_autocomplete_dismissed = false;
+        }
+        else
+        {
+            m_show_autocomplete = false;
+            return;
+        }
+    }
+    
+    m_autocomplete_prefix = line.substr(brace_pos + 1, col - brace_pos - 1);
+    m_autocomplete_start_pos = TextEditor::Coordinates(cursor.mLine, brace_pos + 1);
+    
+    size_t dot_pos = m_autocomplete_prefix.find('.');
+    
+    if (dot_pos != std::string::npos)
+    {
+        std::string color_key = m_autocomplete_prefix.substr(0, dot_pos);
+        std::string format_prefix = m_autocomplete_prefix.substr(dot_pos + 1);
+        
+        bool valid_key = false;
+        for (size_t i = 0; i < clrsync::core::NUM_COLOR_KEYS; ++i)
+        {
+            if (clrsync::core::COLOR_KEYS[i] == color_key)
+            {
+                valid_key = true;
+                break;
+            }
+        }
+        
+        if (valid_key)
+        {
+            for (const auto &fmt : COLOR_FORMATS)
+            {
+                if (format_prefix.empty() || 
+                    fmt.find(format_prefix) == 0 ||
+                    fmt.find(format_prefix) != std::string::npos)
+                {
+                    m_autocomplete_suggestions.push_back(color_key + "." + fmt);
+                }
+            }
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < clrsync::core::NUM_COLOR_KEYS; ++i)
+        {
+            std::string key = clrsync::core::COLOR_KEYS[i];
+            if (m_autocomplete_prefix.empty() || 
+                key.find(m_autocomplete_prefix) == 0 ||
+                key.find(m_autocomplete_prefix) != std::string::npos)
+            {
+                m_autocomplete_suggestions.push_back(key);
+            }
+        }
+    }
+    
+    std::sort(m_autocomplete_suggestions.begin(), m_autocomplete_suggestions.end(),
+        [this](const std::string &a, const std::string &b) {
+            bool a_prefix = a.find(m_autocomplete_prefix) == 0;
+            bool b_prefix = b.find(m_autocomplete_prefix) == 0;
+            if (a_prefix != b_prefix)
+                return a_prefix;
+            return a < b;
+        });
+    
+    m_show_autocomplete = !m_autocomplete_suggestions.empty();
+    if (m_show_autocomplete && m_autocomplete_selected >= (int)m_autocomplete_suggestions.size())
+    {
+        m_autocomplete_selected = 0;
+    }
+}
+
+void template_editor::render_autocomplete(const ImVec2& editor_pos)
+{
+    if (!m_show_autocomplete || m_autocomplete_suggestions.empty())
+        return;
+    
+    float line_height = ImGui::GetTextLineHeightWithSpacing();
+    float char_width = ImGui::GetFontSize() * 0.5f;
+    auto cursor = m_editor.GetCursorPosition();
+    
+    const float line_number_width = 50.0f;
+    
+    ImVec2 popup_pos;
+    popup_pos.x = editor_pos.x + line_number_width + (m_autocomplete_start_pos.mColumn * char_width);
+    popup_pos.y = editor_pos.y + ((cursor.mLine + 1) * line_height);
+    
+    ImGui::SetNextWindowPos(popup_pos, ImGuiCond_Always);
+    ImGui::SetNextWindowSize(ImVec2(300, 0));
+    
+    ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
+                             ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
+                             ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_AlwaysAutoResize;
+    
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(6, 6));
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4, 2));
+    ImGui::PushStyleColor(ImGuiCol_WindowBg, m_autocomplete_bg_color);
+    ImGui::PushStyleColor(ImGuiCol_Border, m_autocomplete_border_color);
+    
+    if (ImGui::Begin("##autocomplete", nullptr, flags))
+    {
+        ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_dim_text_color);
+        if (m_autocomplete_prefix.find('.') != std::string::npos)
+            ImGui::Text("Formats");
+        else
+            ImGui::Text("Color Keys");
+        ImGui::PopStyleColor();
+        ImGui::Separator();
+        
+        int max_items = std::min((int)m_autocomplete_suggestions.size(), 8);
+        
+        for (int i = 0; i < max_items; ++i)
+        {
+            const auto &suggestion = m_autocomplete_suggestions[i];
+            bool is_selected = (i == m_autocomplete_selected);
+            
+            if (is_selected)
+            {
+                ImVec4 selected_hover = m_autocomplete_selected_color;
+                selected_hover.w = std::min(selected_hover.w + 0.1f, 1.0f);
+                ImGui::PushStyleColor(ImGuiCol_Header, m_autocomplete_selected_color);
+                ImGui::PushStyleColor(ImGuiCol_HeaderHovered, selected_hover);
+                ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_selected_text_color);
+            }
+            else
+            {
+                ImVec4 normal_bg = m_autocomplete_bg_color;
+                normal_bg.w = 0.5f;
+                ImVec4 hover_bg = m_autocomplete_selected_color;
+                hover_bg.w = 0.3f;
+                ImGui::PushStyleColor(ImGuiCol_Header, normal_bg);
+                ImGui::PushStyleColor(ImGuiCol_HeaderHovered, hover_bg);
+                ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_text_color);
+            }
+            
+            std::string display_text = "  " + suggestion;
+            
+            if (ImGui::Selectable(display_text.c_str(), is_selected, 
+                                  ImGuiSelectableFlags_None, ImVec2(0, 0)))
+            {
+                auto start = m_autocomplete_start_pos;
+                auto end = m_editor.GetCursorPosition();
+                m_editor.SetSelection(start, end);
+                m_editor.Delete();
+                m_editor.InsertText(suggestion + "}");
+                m_show_autocomplete = false;
+                m_autocomplete_dismissed = false;
+            }
+            
+            ImGui::PopStyleColor(3);
+            
+            if (is_selected && ImGui::IsWindowAppearing())
+            {
+                ImGui::SetScrollHereY();
+            }
+        }
+        
+        if (m_autocomplete_suggestions.size() > 8)
+        {
+            ImGui::Separator();
+            ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_dim_text_color);
+            ImGui::Text("  +%d more", (int)m_autocomplete_suggestions.size() - 8);
+            ImGui::PopStyleColor();
+        }
+        
+        ImGui::Separator();
+        ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_dim_text_color);
+        ImGui::Text("  Tab/Enter: accept | Esc: dismiss");
+        ImGui::PopStyleColor();
+    }
+    ImGui::End();
+    
+    ImGui::PopStyleColor(2);
+    ImGui::PopStyleVar(3);
 }
 
 void template_editor::render()
@@ -118,15 +355,40 @@ void template_editor::render()
     render_editor();
     ImGui::EndChild();
 
+    if (m_show_delete_confirmation)
+    {
+        ImGui::OpenPopup("Delete Template?");
+        m_show_delete_confirmation = false;
+    }
+
+    palette_utils::render_delete_confirmation_popup(
+        "Delete Template?", m_template_name, "template", m_current_palette,
+        [this]() {
+            bool success = m_template_controller.remove_template(m_template_name);
+            if (success)
+            {
+                new_template();
+                refresh_templates();
+            }
+            else
+            {
+                m_validation_error = "Failed to delete template";
+            }
+        });
+
     ImGui::End();
 }
 
 void template_editor::render_controls()
 {
-    if (ImGui::Button("New Template"))
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4, 8));
+    
+    if (ImGui::Button(" + New "))
     {
         new_template();
     }
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Create a new template");
 
     if (ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) &&
         ImGui::IsKeyDown(ImGuiKey_LeftCtrl) && ImGui::IsKeyPressed(ImGuiKey_S))
@@ -135,15 +397,76 @@ void template_editor::render_controls()
     }
 
     ImGui::SameLine();
-    if (ImGui::Button("Save"))
+    if (ImGui::Button(" Save "))
     {
         save_template();
     }
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Save template (Ctrl+S)");
+
+    if (m_is_editing_existing)
+    {
+        ImGui::SameLine();
+        auto error = palette_utils::get_color(m_current_palette, "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(m_current_palette, "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 "))
+        {
+            delete_template();
+        }
+        if (ImGui::IsItemHovered())
+            ImGui::SetTooltip("Delete this template");
+        ImGui::PopStyleColor(4);
+    }
 
     ImGui::SameLine();
-    ImGui::Text("Template Name:");
-    ImGui::SameLine();
-    ImGui::SetNextItemWidth(150.0f);
+    ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 10);
+    
+    bool enabled_changed = false;
+    if (m_enabled)
+    {
+        ImVec4 success_color = palette_utils::get_color(m_current_palette, "success", "accent");
+        ImVec4 success_hover = ImVec4(success_color.x * 1.2f, success_color.y * 1.2f, success_color.z * 1.2f, 0.6f);
+        ImVec4 success_check = ImVec4(success_color.x * 1.5f, success_color.y * 1.5f, success_color.z * 1.5f, 1.0f);
+        ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(success_color.x, success_color.y, success_color.z, 0.5f));
+        ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, success_hover);
+        ImGui::PushStyleColor(ImGuiCol_CheckMark, success_check);
+    }
+    else
+    {
+        ImVec4 error_color = palette_utils::get_color(m_current_palette, "error", "accent");
+        ImVec4 error_hover = ImVec4(error_color.x * 1.2f, error_color.y * 1.2f, error_color.z * 1.2f, 0.6f);
+        ImVec4 error_check = ImVec4(error_color.x * 1.5f, error_color.y * 1.5f, error_color.z * 1.5f, 1.0f);
+        ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(error_color.x, error_color.y, error_color.z, 0.5f));
+        ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, error_hover);
+        ImGui::PushStyleColor(ImGuiCol_CheckMark, error_check);
+    }
+    
+    enabled_changed = ImGui::Checkbox("Enabled", &m_enabled);
+    ImGui::PopStyleColor(3);
+    
+    if (enabled_changed && m_is_editing_existing)
+    {
+        m_template_controller.set_template_enabled(m_template_name, m_enabled);
+    }
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Enable/disable this template for theme application");
+    
+    ImGui::PopStyleVar();
+    
+    ImGui::Spacing();
+    
+    ImGui::AlignTextToFramePadding();
+    ImGui::Text("Name:");
+    ImGui::SameLine(80);
+    ImGui::SetNextItemWidth(180.0f);
     char name_buf[256] = {0};
     snprintf(name_buf, sizeof(name_buf), "%s", m_template_name.c_str());
     if (ImGui::InputText("##template_name", name_buf, sizeof(name_buf)))
@@ -154,22 +477,51 @@ void template_editor::render_controls()
             m_validation_error = "";
         }
     }
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Unique name for this template");
 
-    ImGui::SameLine();
-    if (ImGui::Checkbox("Enabled", &m_enabled))
+    ImGui::AlignTextToFramePadding();
+    ImGui::Text("Input:");
+    ImGui::SameLine(80);
+    ImGui::SetNextItemWidth(-120.0f);
+    char input_path_buf[512] = {0};
+    snprintf(input_path_buf, sizeof(input_path_buf), "%s", m_input_path.c_str());
+    if (ImGui::InputTextWithHint("##input_path", "Path to template file...", 
+                                  input_path_buf, sizeof(input_path_buf)))
     {
+        m_input_path = input_path_buf;
+        if (!m_input_path.empty())
+        {
+            m_validation_error = "";
+        }
         if (m_is_editing_existing)
         {
-            m_template_controller.set_template_enabled(m_template_name, m_enabled);
+            m_template_controller.set_template_input_path(m_template_name, m_input_path);
         }
     }
-
-    ImGui::Text("Output Path:");
     ImGui::SameLine();
-    ImGui::SetNextItemWidth(-FLT_MIN);
+    if (ImGui::Button("Browse##input"))
+    {
+        std::string selected_path = file_dialogs::open_file_dialog("Select Template File", m_input_path);
+        if (!selected_path.empty()) {
+            m_input_path = selected_path;
+            if (m_is_editing_existing) {
+                m_template_controller.set_template_input_path(m_template_name, m_input_path);
+            }
+            m_validation_error = "";
+        }
+    }
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Path where the template source file is stored");
+
+    ImGui::AlignTextToFramePadding();
+    ImGui::Text("Output:");
+    ImGui::SameLine(80);
+    ImGui::SetNextItemWidth(-120.0f);
     char path_buf[512] = {0};
     snprintf(path_buf, sizeof(path_buf), "%s", m_output_path.c_str());
-    if (ImGui::InputText("##output_path", path_buf, sizeof(path_buf)))
+    if (ImGui::InputTextWithHint("##output_path", "Path for generated config...", 
+                                 path_buf, sizeof(path_buf)))
     {
         m_output_path = path_buf;
         if (!m_output_path.empty())
@@ -181,13 +533,29 @@ void template_editor::render_controls()
             m_template_controller.set_template_output_path(m_template_name, m_output_path);
         }
     }
-
-    ImGui::Text("Reload Command:");
     ImGui::SameLine();
+    if (ImGui::Button("Browse##output"))
+    {
+        std::string selected_path = file_dialogs::save_file_dialog("Select Output File", m_output_path);
+        if (!selected_path.empty()) {
+            m_output_path = selected_path;
+            if (m_is_editing_existing) {
+                m_template_controller.set_template_output_path(m_template_name, m_output_path);
+            }
+            m_validation_error = "";
+        }
+    }
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Path where the processed config will be written");
+
+    ImGui::AlignTextToFramePadding();
+    ImGui::Text("Reload:");
+    ImGui::SameLine(80);
     ImGui::SetNextItemWidth(-FLT_MIN);
     char reload_buf[512] = {0};
     snprintf(reload_buf, sizeof(reload_buf), "%s", m_reload_command.c_str());
-    if (ImGui::InputText("##reload_cmd", reload_buf, sizeof(reload_buf)))
+    if (ImGui::InputTextWithHint("##reload_cmd", "Command to reload app (optional)...",
+                                 reload_buf, sizeof(reload_buf)))
     {
         m_reload_command = reload_buf;
         if (m_is_editing_existing)
@@ -195,10 +563,13 @@ void template_editor::render_controls()
             m_template_controller.set_template_reload_command(m_template_name, m_reload_command);
         }
     }
+    if (ImGui::IsItemHovered())
+        ImGui::SetTooltip("Shell command to run after applying theme (e.g., 'pkill -USR1 kitty')");
 
     if (!m_validation_error.empty())
     {
-        ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.3f, 0.3f, 1.0f));
+        ImGui::Spacing();
+        ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.4f, 0.4f, 1.0f));
         ImGui::TextWrapped("%s", m_validation_error.c_str());
         ImGui::PopStyleColor();
     }
@@ -206,15 +577,17 @@ void template_editor::render_controls()
 
 void template_editor::render_editor()
 {
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8, 4));
+    
     if (!m_is_editing_existing)
     {
         ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.4f, 0.8f, 0.4f, 1.0f));
-        ImGui::Text("New Template");
+        ImGui::Text("  New Template");
         ImGui::PopStyleColor();
     }
     else
     {
-        ImGui::Text("%s", m_template_name.c_str());
+        ImGui::Text("  %s", m_template_name.c_str());
         auto trim_right = [](const std::string &s) -> std::string {
             size_t end = s.find_last_not_of("\r\n");
             return (end == std::string::npos) ? "" : s.substr(0, end + 1);
@@ -228,39 +601,159 @@ void template_editor::render_editor()
         {
             ImGui::SameLine();
             ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.6f, 0.2f, 1.0f));
-            ImGui::Text("●");
+            ImGui::Text("(unsaved)");
             ImGui::PopStyleColor();
         }
     }
     
+    ImGui::SameLine(ImGui::GetContentRegionAvail().x - 30);
+    ImGui::TextDisabled("(?)");
+    if (ImGui::IsItemHovered())
+    {
+        ImGui::BeginTooltip();
+        ImGui::PushTextWrapPos(ImGui::GetFontSize() * 25.0f);
+        ImGui::TextUnformatted("Template Syntax:");
+        ImGui::Separator();
+        ImGui::TextUnformatted("Use {color_key.format} for color variables");
+        ImGui::Spacing();
+        ImGui::TextUnformatted("Color Keys: background, foreground, accent, etc.");
+        ImGui::TextUnformatted("Formats: hex, rgb, rgba, r, g, b, hsl, hsla, etc.");
+        ImGui::Spacing();
+        ImGui::TextUnformatted("Examples:");
+        ImGui::BulletText("{background.hex} -> #1E1E1E");
+        ImGui::BulletText("{accent.rgb} -> rgb(14,99,156)");
+        ImGui::BulletText("{foreground.r} -> 204");
+        ImGui::Spacing();
+        ImGui::TextUnformatted("Tip: Type '{' to trigger autocomplete!");
+        ImGui::PopTextWrapPos();
+        ImGui::EndTooltip();
+    }
+    
+    ImGui::PopStyleVar();
     ImGui::Separator();
 
+    bool consume_keys = false;
+    
+    if (m_show_autocomplete && ImGui::IsKeyPressed(ImGuiKey_Escape, false))
+    {
+        m_show_autocomplete = false;
+        m_autocomplete_dismissed = true;
+        
+        m_dismiss_position = m_editor.GetCursorPosition();
+        
+        std::string line = m_editor.GetCurrentLineText();
+        m_dismiss_brace_pos = -1;
+        for (int i = m_dismiss_position.mColumn - 1; i >= 0; --i)
+        {
+            if (i < (int)line.length() && line[i] == '{')
+            {
+                m_dismiss_brace_pos = i;
+                break;
+            }
+        }
+        
+        consume_keys = true;
+    }
+    else if (m_show_autocomplete && !m_autocomplete_suggestions.empty())
+    {
+        int max_visible = std::min((int)m_autocomplete_suggestions.size(), 8);
+        
+        if (ImGui::IsKeyPressed(ImGuiKey_DownArrow, false))
+        {
+            m_autocomplete_selected = (m_autocomplete_selected + 1) % max_visible;
+            consume_keys = true;
+        }
+        else if (ImGui::IsKeyPressed(ImGuiKey_UpArrow, false))
+        {
+            m_autocomplete_selected = (m_autocomplete_selected - 1 + max_visible) % max_visible;
+            consume_keys = true;
+        }
+        else if (ImGui::IsKeyPressed(ImGuiKey_Tab, false) || 
+                 ImGui::IsKeyPressed(ImGuiKey_Enter, false))
+        {
+            auto start = m_autocomplete_start_pos;
+            auto end = m_editor.GetCursorPosition();
+            m_editor.SetSelection(start, end);
+            m_editor.Delete();
+            m_editor.InsertText(m_autocomplete_suggestions[m_autocomplete_selected] + "}");
+            m_show_autocomplete = false;
+            m_autocomplete_dismissed = false; 
+            consume_keys = true;
+        }
+    }
+    
+    if (consume_keys)
+    {
+        m_editor.SetHandleKeyboardInputs(false);
+    }
+
+    ImVec2 editor_pos = ImGui::GetCursorScreenPos();
+    
     m_editor.Render("##TemplateEditor", ImVec2(0, 0), true);
+    
+    if (consume_keys)
+    {
+        m_editor.SetHandleKeyboardInputs(true);
+    }
+    
+    update_autocomplete_suggestions();
+    render_autocomplete(editor_pos);
 }
 
 void template_editor::render_template_list()
 {
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8, 6));
+    
     ImGui::Text("Templates");
+    ImGui::SameLine(ImGui::GetContentRegionAvail().x - 20);
+    ImGui::TextDisabled("(%d)", (int)m_template_controller.templates().size());
     ImGui::Separator();
 
     if (!m_is_editing_existing)
     {
-        ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.4f, 0.8f, 0.4f, 1.0f));
-        ImGui::Selectable("* New Template *", true);
-        ImGui::PopStyleColor();
+        ImVec4 success_color = palette_utils::get_color(m_current_palette, "success", "accent");
+        ImVec4 success_bg = ImVec4(success_color.x, success_color.y, success_color.z, 0.5f);
+        ImGui::PushStyleColor(ImGuiCol_Text, success_color);
+        ImGui::PushStyleColor(ImGuiCol_Header, success_bg);
+        ImGui::Selectable("+ New Template", true);
+        ImGui::PopStyleColor(2);
         ImGui::Separator();
     }
 
     const auto &templates = m_template_controller.templates();
 
-    for (const auto &key : templates | std::views::keys)
+    for (const auto &[key, tmpl] : templates)
     {
         const bool selected = (m_template_name == key && m_is_editing_existing);
+        
+        if (!tmpl.enabled())
+        {
+            ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.5f, 0.5f, 0.5f, 1.0f));
+        }
+        
         if (ImGui::Selectable(key.c_str(), selected))
         {
             load_template(key);
         }
+        
+        if (!tmpl.enabled())
+        {
+            ImGui::PopStyleColor();
         }
+        
+        if (ImGui::IsItemHovered())
+        {
+            ImGui::BeginTooltip();
+            ImGui::Text("Template: %s", key.c_str());
+            ImGui::Separator();
+            ImGui::Text("Status: %s", tmpl.enabled() ? "Enabled" : "Disabled");
+            if (!tmpl.output_path().empty())
+                ImGui::Text("Output: %s", tmpl.output_path().c_str());
+            ImGui::EndTooltip();
+        }
+    }
+    
+    ImGui::PopStyleVar();
 }
 
 bool template_editor::is_valid_path(const std::string &path)
@@ -318,6 +811,10 @@ void template_editor::save_template()
     trimmed_name.erase(0, trimmed_name.find_first_not_of(" \t\n\r"));
     trimmed_name.erase(trimmed_name.find_last_not_of(" \t\n\r") + 1);
 
+    std::string trimmed_input_path = m_input_path;
+    trimmed_input_path.erase(0, trimmed_input_path.find_first_not_of(" \t\n\r"));
+    trimmed_input_path.erase(trimmed_input_path.find_last_not_of(" \t\n\r") + 1);
+
     std::string trimmed_path = m_output_path;
     trimmed_path.erase(0, trimmed_path.find_first_not_of(" \t\n\r"));
     trimmed_path.erase(trimmed_path.find_last_not_of(" \t\n\r") + 1);
@@ -328,6 +825,12 @@ void template_editor::save_template()
         return;
     }
 
+    if (trimmed_input_path.empty())
+    {
+        m_validation_error = "Error: Input path cannot be empty!";
+        return;
+    }
+
     if (trimmed_path.empty())
     {
         m_validation_error = "Error: Output path cannot be empty!";
@@ -343,56 +846,55 @@ void template_editor::save_template()
 
     m_validation_error = "";
 
+    auto &cfg = clrsync::core::config::instance();
+
+    std::filesystem::path template_file = clrsync::core::normalize_path(trimmed_input_path);
+    
+    auto parent_dir = template_file.parent_path();
+    if (!parent_dir.empty() && !std::filesystem::exists(parent_dir))
+    {
         try
         {
-        auto &cfg = clrsync::core::config::instance();
-        std::string palettes_path = cfg.palettes_path();
-        std::filesystem::path templates_dir =
-            std::filesystem::path(palettes_path).parent_path() / "templates";
-
-        if (!std::filesystem::exists(templates_dir))
-        {
-            std::filesystem::create_directories(templates_dir);
+            std::filesystem::create_directories(parent_dir);
         }
-
-        std::filesystem::path template_file;
-        if (m_is_editing_existing)
+        catch (const std::exception& e)
         {
-            const auto &existing_template = cfg.template_by_name(trimmed_name);
-            template_file = existing_template.template_path();
+            m_validation_error = "Error: Could not create directory for input path";
+            return;
         }
-        else
-        {
-            template_file = templates_dir / trimmed_name;
     }
 
     std::string template_content = m_editor.GetText();
 
     std::ofstream out(template_file);
-        if (out.is_open())
+    if (!out.is_open())
     {
+        m_validation_error = "Failed to write template file";
+        return;
+    }
+    
     out << template_content;
     out.close();
-        }
 
     clrsync::core::theme_template tmpl(trimmed_name, template_file.string(), trimmed_path);
     tmpl.set_reload_command(m_reload_command);
     tmpl.set_enabled(m_enabled);
 
-        cfg.update_template(trimmed_name, tmpl);
+    auto result = cfg.update_template(trimmed_name, tmpl);
+    if (!result)
+    {
+        m_validation_error = "Error saving template: " + result.error().description();
+        return;
+    }
 
     m_template_name = trimmed_name;
+    m_input_path = trimmed_input_path;
     m_output_path = trimmed_path;
     m_is_editing_existing = true;
     m_saved_content = m_editor.GetText();
     m_has_unsaved_changes = false;
 
     refresh_templates();
-    }
-    catch (const std::exception &e)
-    {
-        m_validation_error = std::string("Error saving template: ") + e.what();
-    }
 }
 
 void template_editor::load_template(const std::string &name)
@@ -404,14 +906,13 @@ void template_editor::load_template(const std::string &name)
     {
         const auto &tmpl = it->second;
         m_template_name = name;
+        m_input_path = tmpl.template_path();
         m_output_path = tmpl.output_path();
         m_reload_command = tmpl.reload_command();
         m_enabled = tmpl.enabled();
         m_is_editing_existing = true;
         m_validation_error = "";
 
-        try
-        {
         std::ifstream in(tmpl.template_path());
         if (in.is_open())
         {
@@ -427,10 +928,9 @@ void template_editor::load_template(const std::string &name)
             m_saved_content = content;
             m_has_unsaved_changes = false;
         }
-        }
-        catch (const std::exception &e)
+        else
         {
-            m_validation_error = std::string("Error loading template: ") + e.what();
+            m_validation_error = "Error loading template: Failed to open file";
         }
     }
 }
@@ -443,6 +943,7 @@ void template_editor::new_template()
         "Examples: {color.hex}, {color.rgb}, {color.r}\n\n";
     m_editor.SetText(default_content);
     m_saved_content = default_content;
+    m_input_path = "";
     m_output_path = "";
     m_reload_command = "";
     m_enabled = true;
@@ -451,6 +952,14 @@ void template_editor::new_template()
     m_has_unsaved_changes = false;
 }
 
+void template_editor::delete_template()
+{
+    if (!m_is_editing_existing || m_template_name.empty())
+        return;
+    
+    m_show_delete_confirmation = true;
+}
+
 void template_editor::refresh_templates()
 {
     m_template_controller.refresh();

src/gui/template_editor.hpp

@@ -4,7 +4,9 @@
 #include "template_controller.hpp"
 #include <core/palette/palette.hpp>
 #include "color_text_edit/TextEditor.h"
+#include "imgui.h"
 #include <string>
+#include <vector>
 
 class template_editor
 {
@@ -17,10 +19,13 @@ private:
     void render_controls();
     void render_editor();
     void render_template_list();
+    void render_autocomplete(const ImVec2& editor_pos);
+    void update_autocomplete_suggestions();
 
     void save_template();
     void load_template(const std::string &name);
     void new_template();
+    void delete_template();
     void refresh_templates();
 
     bool is_valid_path(const std::string &path);
@@ -29,6 +34,7 @@ private:
     TextEditor m_editor;
     
     std::string m_template_name;
+    std::string m_input_path;
     std::string m_output_path;
     std::string m_reload_command;
     std::string m_validation_error;
@@ -37,6 +43,25 @@ private:
     
     bool m_enabled{true};
     bool m_is_editing_existing{false};
+    bool m_show_delete_confirmation{false};
+
+    bool m_show_autocomplete{false};
+    bool m_autocomplete_dismissed{false};
+    TextEditor::Coordinates m_dismiss_position;
+    int m_dismiss_brace_pos{-1};
+    std::vector<std::string> m_autocomplete_suggestions;
+    int m_autocomplete_selected{0};
+    std::string m_autocomplete_prefix;
+    TextEditor::Coordinates m_autocomplete_start_pos;
+    
+    ImVec4 m_autocomplete_bg_color;
+    ImVec4 m_autocomplete_border_color;
+    ImVec4 m_autocomplete_selected_color;
+    ImVec4 m_autocomplete_text_color;
+    ImVec4 m_autocomplete_selected_text_color;
+    ImVec4 m_autocomplete_dim_text_color;
+    
+    clrsync::core::palette m_current_palette;
 };
 
 #endif // CLRSYNC_GUI_TEMPLATE_EDITOR_HPP

src/gui/theme_applier.cpp

@@ -0,0 +1,138 @@
+#include "theme_applier.hpp"
+#include "imgui.h"
+
+namespace theme_applier
+{
+
+void apply_to_editor(TextEditor& editor, const clrsync::core::palette& current)
+{
+    auto get_color_u32 = [&](const std::string &key) -> uint32_t {
+        const auto &col = current.get_color(key);
+        const uint32_t hex = col.hex();
+        // Convert from RRGGBBAA to AABBGGRR (ImGui format)
+        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;
+    };
+
+    auto palette = editor.GetPalette();
+
+    palette[int(TextEditor::PaletteIndex::Default)] = get_color_u32("editor_main");
+    palette[int(TextEditor::PaletteIndex::Keyword)] = get_color_u32("editor_command");
+    palette[int(TextEditor::PaletteIndex::Number)] = get_color_u32("editor_warning");
+    palette[int(TextEditor::PaletteIndex::String)] = get_color_u32("editor_string");
+    palette[int(TextEditor::PaletteIndex::CharLiteral)] = get_color_u32("editor_string");
+    palette[int(TextEditor::PaletteIndex::Punctuation)] = get_color_u32("editor_main");
+    palette[int(TextEditor::PaletteIndex::Preprocessor)] = get_color_u32("editor_emphasis");
+    palette[int(TextEditor::PaletteIndex::Identifier)] = get_color_u32("editor_main");
+    palette[int(TextEditor::PaletteIndex::KnownIdentifier)] = get_color_u32("editor_link");
+    palette[int(TextEditor::PaletteIndex::PreprocIdentifier)] = get_color_u32("editor_link");
+
+    palette[int(TextEditor::PaletteIndex::Comment)] = get_color_u32("editor_comment");
+    palette[int(TextEditor::PaletteIndex::MultiLineComment)] = get_color_u32("editor_comment");
+
+    palette[int(TextEditor::PaletteIndex::Background)] = get_color_u32("editor_background");
+    palette[int(TextEditor::PaletteIndex::Cursor)] = get_color_u32("cursor");
+
+    palette[int(TextEditor::PaletteIndex::Selection)] = get_color_u32("editor_selected");
+    palette[int(TextEditor::PaletteIndex::ErrorMarker)] = get_color_u32("editor_error");
+    palette[int(TextEditor::PaletteIndex::Breakpoint)] = get_color_u32("editor_error");
+
+    palette[int(TextEditor::PaletteIndex::LineNumber)] = get_color_u32("editor_line_number");
+    palette[int(TextEditor::PaletteIndex::CurrentLineFill)] = get_color_u32("surface_variant");
+    palette[int(TextEditor::PaletteIndex::CurrentLineFillInactive)] = get_color_u32("surface");
+
+    palette[int(TextEditor::PaletteIndex::CurrentLineEdge)] = get_color_u32("border_focused");
+
+    editor.SetPalette(palette);
+}
+
+void apply_to_imgui(const clrsync::core::palette& current)
+{
+    auto getColor = [&](const std::string &key) -> ImVec4 {
+        const auto &col = current.get_color(key);
+        const uint32_t hex = col.hex();
+        return {((hex >> 24) & 0xFF) / 255.0f, ((hex >> 16) & 0xFF) / 255.0f,
+                ((hex >> 8) & 0xFF) / 255.0f, ((hex) & 0xFF) / 255.0f};
+    };
+
+    ImGuiStyle &style = ImGui::GetStyle();
+
+    const ImVec4 bg = getColor("background");
+    const ImVec4 surface = getColor("surface");
+    const ImVec4 surfaceVariant = getColor("surface_variant");
+    const ImVec4 fg = getColor("foreground");
+    const ImVec4 fgInactive = getColor("editor_inactive");
+    const ImVec4 accent = getColor("accent");
+    const ImVec4 border = getColor("border");
+
+    style.Colors[ImGuiCol_WindowBg] = bg;
+    style.Colors[ImGuiCol_ChildBg] = surface;
+    style.Colors[ImGuiCol_PopupBg] = surface;
+
+    style.Colors[ImGuiCol_Border] = border;
+    style.Colors[ImGuiCol_BorderShadow] = ImVec4(0, 0, 0, 0);
+
+    style.Colors[ImGuiCol_Text] = fg;
+    style.Colors[ImGuiCol_TextDisabled] = fgInactive;
+
+    style.Colors[ImGuiCol_Header] = surfaceVariant;
+    style.Colors[ImGuiCol_HeaderHovered] = ImVec4(accent.x, accent.y, accent.z, 0.8f);
+    style.Colors[ImGuiCol_HeaderActive] = accent;
+
+    style.Colors[ImGuiCol_Button] = surfaceVariant;
+    style.Colors[ImGuiCol_ButtonHovered] = ImVec4(accent.x, accent.y, accent.z, 0.6f);
+    style.Colors[ImGuiCol_ButtonActive] = accent;
+
+    style.Colors[ImGuiCol_FrameBg] = surfaceVariant;
+    style.Colors[ImGuiCol_FrameBgHovered] =
+        ImVec4(surfaceVariant.x * 1.1f, surfaceVariant.y * 1.1f, surfaceVariant.z * 1.1f, 1.0f);
+    style.Colors[ImGuiCol_FrameBgActive] =
+        ImVec4(surfaceVariant.x * 1.2f, surfaceVariant.y * 1.2f, surfaceVariant.z * 1.2f, 1.0f);
+
+    style.Colors[ImGuiCol_TitleBg] = surface;
+    style.Colors[ImGuiCol_TitleBgActive] = surfaceVariant;
+    style.Colors[ImGuiCol_TitleBgCollapsed] = surface;
+
+    style.Colors[ImGuiCol_ScrollbarBg] = surface;
+    style.Colors[ImGuiCol_ScrollbarGrab] = surfaceVariant;
+    style.Colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(accent.x, accent.y, accent.z, 0.6f);
+    style.Colors[ImGuiCol_ScrollbarGrabActive] = accent;
+
+    style.Colors[ImGuiCol_SliderGrab] = accent;
+    style.Colors[ImGuiCol_SliderGrabActive] =
+        ImVec4(accent.x * 1.2f, accent.y * 1.2f, accent.z * 1.2f, 1.0f);
+
+    style.Colors[ImGuiCol_CheckMark] = accent;
+    style.Colors[ImGuiCol_ResizeGrip] = surfaceVariant;
+    style.Colors[ImGuiCol_ResizeGripHovered] = ImVec4(accent.x, accent.y, accent.z, 0.6f);
+    style.Colors[ImGuiCol_ResizeGripActive] = accent;
+
+    style.Colors[ImGuiCol_Tab] = surface;
+    style.Colors[ImGuiCol_TabHovered] = ImVec4(accent.x, accent.y, accent.z, 0.8f);
+    style.Colors[ImGuiCol_TabActive] = surfaceVariant;
+    style.Colors[ImGuiCol_TabUnfocused] = surface;
+    style.Colors[ImGuiCol_TabUnfocusedActive] = surfaceVariant;
+    style.Colors[ImGuiCol_TabSelectedOverline] = accent;
+
+    style.Colors[ImGuiCol_TableHeaderBg] = surfaceVariant;
+    style.Colors[ImGuiCol_TableBorderStrong] = border;
+    style.Colors[ImGuiCol_TableBorderLight] =
+        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(fg.x, fg.y, fg.z, 0.06f);
+
+    style.Colors[ImGuiCol_Separator] = border;
+    style.Colors[ImGuiCol_SeparatorHovered] = accent;
+    style.Colors[ImGuiCol_SeparatorActive] = accent;
+
+    style.Colors[ImGuiCol_MenuBarBg] = surface;
+
+    style.Colors[ImGuiCol_DockingPreview] = ImVec4(accent.x, accent.y, accent.z, 0.7f);
+    style.Colors[ImGuiCol_DockingEmptyBg] = bg;
+}
+
+} // namespace theme_applier

src/gui/theme_applier.hpp

@@ -0,0 +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"
+
+namespace theme_applier
+{
+    void apply_to_imgui(const clrsync::core::palette& pal);
+    void apply_to_editor(TextEditor& editor, const clrsync::core::palette& pal);
+}
+
+#endif // CLRSYNC_GUI_THEME_APPLIER_HPP