diff --git a/README.md b/README.md
index ef50a0b..b730c2f 100644
--- a/README.md
+++ b/README.md
@@ -72,17 +72,24 @@ sudo pkg install lcd4linux-ax206
 
 ### What gets installed
 
-**Linux:**
+**Linux (`lcd4linux-ax206`):**
 - `/usr/bin/lcd4linux` — the binary
 - `/etc/lcd4linux/lcd4linux.conf` — default configuration (320x240 DPF layout)
 - `/etc/lcd4linux/examples/` — additional example configs
 - `lcd4linux-ax206.service` — systemd service unit
 
+**Linux (`lcd4linux-ax206-themes`, optional):**
+- `/usr/bin/lcd4linux-theme` — theme management CLI
+- `/usr/share/lcd4linux/themes/` — 39 pre-built themes
+- `/usr/share/lcd4linux/fonts/` — bundled TrueType fonts
+
 **FreeBSD:**
 - `/usr/local/bin/lcd4linux` — the binary
+- `/usr/local/bin/lcd4linux-theme` — theme management CLI
 - `/usr/local/etc/lcd4linux/lcd4linux.conf` — default configuration
 - `/usr/local/etc/lcd4linux/examples/` — additional example configs
-- `/usr/local/share/lcd4linux/themes/` — pre-built themes
+- `/usr/local/share/lcd4linux/themes/` — 39 pre-built themes
+- `/usr/local/share/lcd4linux/fonts/` — bundled TrueType fonts
 - `/usr/local/etc/rc.d/lcd4linux` — rc.d service script
 
 ### Starting the service
@@ -230,10 +237,29 @@ See [AX206 Fork Features](https://github.com/amd989/lcd4linux-ax206/wiki/ax206_f
 
 **[Browse the Theme Gallery →](themes/README.md)**
 
-To use a theme, point lcd4linux at its config file:
+### Using themes after installation
+
+Install the themes package, then use the `lcd4linux-theme` CLI:
+
+```bash
+sudo apt install lcd4linux-ax206-themes
+
+# List all available themes
+lcd4linux-theme list
+
+# Apply a theme (backs up your current config automatically)
+sudo lcd4linux-theme apply SimpleBlue
+
+# Check what's currently active
+lcd4linux-theme current
+```
+
+### Using themes from source
+
+Point lcd4linux directly at the config file from the repository root:
 
 ```bash
-lcd4linux -F -c themes/SimpleWhite/dpf_simplewhite.conf
+./lcd4linux -F -f themes/SimpleWhite/dpf_simplewhite.conf
 ```
 
 Original theme designs from [turing-smart-screen-python](https://github.com/mathoudebine/turing-smart-screen-python), adapted for lcd4linux. Theme authors: [@takattila](https://github.com/takattila), [@mathoudebine](https://github.com/mathoudebine), [@napobear](https://github.com/napobear), [@amiltonjr](https://github.com/amiltonjr). Licensed under GPL-3.0.
diff --git a/debian/control b/debian/control
index 364982a..9543fea 100644
--- a/debian/control
+++ b/debian/control
@@ -27,3 +27,11 @@ Description: LCD display driver for AX206 USB displays
  .
  Features include pixel-level brightness control, VNC mirror display support,
  TrueType font rendering, and graphical bar widgets with color thresholds.
+
+Package: lcd4linux-ax206-themes
+Architecture: all
+Depends: lcd4linux-ax206, ${misc:Depends}
+Description: Themes and fonts for lcd4linux-ax206
+ Collection of 39 pre-built themes with background images and TrueType fonts
+ for AX206 USB LCD displays. Includes a theme management CLI (lcd4linux-theme)
+ for easy theme switching.
diff --git a/debian/lcd4linux-ax206-themes.install b/debian/lcd4linux-ax206-themes.install
new file mode 100644
index 0000000..a9b7017
--- /dev/null
+++ b/debian/lcd4linux-ax206-themes.install
@@ -0,0 +1,3 @@
+lcd4linux-theme usr/bin
+themes usr/share/lcd4linux
+fonts usr/share/lcd4linux
diff --git a/debian/lcd4linux-ax206.dirs b/debian/lcd4linux-ax206.dirs
new file mode 100644
index 0000000..fb55a98
--- /dev/null
+++ b/debian/lcd4linux-ax206.dirs
@@ -0,0 +1 @@
+usr/share/lcd4linux
diff --git a/debian/lcd4linux-ax206.service b/debian/lcd4linux-ax206.service
index 76c8c04..26e4535 100644
--- a/debian/lcd4linux-ax206.service
+++ b/debian/lcd4linux-ax206.service
@@ -4,7 +4,8 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStartPre=/bin/sh -c 'test -f /etc/lcd4linux/lcd4linux.conf || { echo "No config found. Copy an example: sudo cp /etc/lcd4linux/examples/dpf_320x240.conf /etc/lcd4linux/lcd4linux.conf"; exit 1; }'
+WorkingDirectory=/usr/share/lcd4linux
+ExecStartPre=/bin/sh -c 'test -f /etc/lcd4linux/lcd4linux.conf || { echo "No config found. Run: sudo lcd4linux-theme apply SimpleBlue"; exit 1; }'
 ExecStart=/usr/bin/lcd4linux -F -f /etc/lcd4linux/lcd4linux.conf
 Restart=on-failure
 RestartSec=10
diff --git a/debian/rules b/debian/rules
index ff056d5..07d5c7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install
 	install -D -m 0644 dpf_320x240.conf debian/lcd4linux-ax206/etc/lcd4linux/lcd4linux.conf
+	chmod 0755 debian/lcd4linux-ax206-themes/usr/bin/lcd4linux-theme
 
 override_dh_auto_clean:
 	[ ! -f Makefile ] || dh_auto_clean
diff --git a/gh-pages/index.html b/gh-pages/index.html
index 6b24125..468503f 100644
--- a/gh-pages/index.html
+++ b/gh-pages/index.html
@@ -93,21 +93,24 @@ <h1>lcd4linux-ax206</h1>
       <h2>apt</h2>
       <div class="distros">Debian, Ubuntu, Mint</div>
       <pre><code><span class="prompt">$ </span><span class="cmd">curl -fsSL https://amd989.github.io/lcd4linux-ax206/setup-apt.sh | sudo bash</span>
-<span class="prompt">$ </span><span class="cmd">sudo apt install lcd4linux-ax206</span></code></pre>
+<span class="prompt">$ </span><span class="cmd">sudo apt install lcd4linux-ax206</span>
+<span class="prompt">$ </span><span class="cmd">sudo apt install lcd4linux-ax206-themes</span>  <span class="prompt"># themes + lcd4linux-theme CLI (optional)</span></code></pre>
     </div>
 
     <div class="card">
       <h2>dnf / yum</h2>
       <div class="distros">RHEL, Rocky Linux, Fedora</div>
       <pre><code><span class="prompt">$ </span><span class="cmd">curl -fsSL https://amd989.github.io/lcd4linux-ax206/setup-rpm.sh | sudo bash</span>
-<span class="prompt">$ </span><span class="cmd">sudo dnf install lcd4linux-ax206</span></code></pre>
+<span class="prompt">$ </span><span class="cmd">sudo dnf install lcd4linux-ax206</span>
+<span class="prompt">$ </span><span class="cmd">sudo dnf install lcd4linux-ax206-themes</span>  <span class="prompt"># themes + lcd4linux-theme CLI (optional)</span></code></pre>
     </div>
 
     <div class="card">
       <h2>pkg</h2>
       <div class="distros">FreeBSD, OPNSense, pfSense</div>
       <pre><code><span class="prompt">$ </span><span class="cmd">curl -fsSL https://amd989.github.io/lcd4linux-ax206/setup-pkg.sh | sudo sh</span>
-<span class="prompt">$ </span><span class="cmd">sudo pkg install lcd4linux-ax206</span></code></pre>
+<span class="prompt">$ </span><span class="cmd">sudo pkg install lcd4linux-ax206</span>
+<span class="prompt">$ </span><span class="cmd">sudo pkg install lcd4linux-ax206-themes</span>  <span class="prompt"># themes + lcd4linux-theme CLI (optional)</span></code></pre>
     </div>
 
     <footer>
diff --git a/lcd4linux-theme b/lcd4linux-theme
new file mode 100644
index 0000000..2266629
--- /dev/null
+++ b/lcd4linux-theme
@@ -0,0 +1,193 @@
+#!/bin/sh
+# lcd4linux-theme — theme manager for lcd4linux-ax206
+set -e
+
+VERSION="1.0.0"
+
+# OS-specific configuration
+if [ "$(uname)" = "FreeBSD" ]; then
+    DATA_DIR=/usr/local/share/lcd4linux
+    CONFIG_DIR=/usr/local/etc/lcd4linux
+    SERVICE_NAME=lcd4linux
+    restart_service() {
+        if service "$SERVICE_NAME" status >/dev/null 2>&1; then
+            service "$SERVICE_NAME" restart
+            echo "Service restarted."
+        else
+            echo "Start the service with: sudo service $SERVICE_NAME start"
+        fi
+    }
+else
+    DATA_DIR=/usr/share/lcd4linux
+    CONFIG_DIR=/etc/lcd4linux
+    SERVICE_NAME=lcd4linux-ax206
+    restart_service() {
+        if systemctl is-active --quiet "$SERVICE_NAME" 2>/dev/null; then
+            systemctl restart "$SERVICE_NAME"
+            echo "Service restarted."
+        else
+            echo "Start the service with: sudo systemctl start $SERVICE_NAME"
+        fi
+    }
+fi
+
+THEMES_DIR="$DATA_DIR/themes"
+CONFIG_FILE="$CONFIG_DIR/lcd4linux.conf"
+MARKER_FILE="$CONFIG_DIR/.current-theme"
+
+get_description() {
+    case "$1" in
+        Cyberdeck)             echo "Multi-gauge: CPU, GPU, RAM, fan, FPS, network" ;;
+        Cyberpunk)             echo "Cyberpunk 2077-styled system monitor" ;;
+        Cyberpunk-net)         echo "Cyberpunk variant with download/upload speeds" ;;
+        LandscapeEarth)        echo "Earth-themed: CPU, GPU, RAM bars, temperature" ;;
+        LandscapeMagicBlue)    echo "Sci-fi: 4 radial gauges, network, disk usage" ;;
+        LandscapeModernDevice35) echo "Server dashboard: sparklines, memory, disk, uptime" ;;
+        NAS)                   echo "4-bay NAS: drive usage, size, temperature" ;;
+        OPNSense)              echo "OPNSense: network traffic, firewall, system health" ;;
+        SimpleBlue)            echo "Blue: CPU, RAM, GPU, temperature" ;;
+        SimpleBlueFall)        echo "Blue, alternate background" ;;
+        SimpleBlueGauge)       echo "Blue with radial arc gauges" ;;
+        SimpleCyberpunkGauge)  echo "Cyberpunk-styled radial gauges" ;;
+        SimpleFire)            echo "Fire-themed system monitor" ;;
+        SimpleFireGauge)       echo "Fire-themed radial gauges" ;;
+        SimpleGreen)           echo "Green: CPU, RAM, GPU, temperature" ;;
+        SimpleGreenFall)       echo "Green, alternate background" ;;
+        SimpleGreenGauge)      echo "Green with radial arc gauges" ;;
+        SimpleMulticolor)      echo "Multi-color variant" ;;
+        SimpleNeon)            echo "Neon-lit system monitor" ;;
+        SimpleNeonGauge)       echo "Neon radial gauges" ;;
+        SimpleOrange)          echo "Orange: CPU, RAM, GPU, temperature" ;;
+        SimpleOrangeFall)      echo "Orange, alternate background" ;;
+        SimpleOrangeGauge)     echo "Orange with radial arc gauges" ;;
+        SimplePurple)          echo "Purple: CPU, RAM, GPU, temperature" ;;
+        SimplePurpleFall)      echo "Purple, alternate background" ;;
+        SimplePurpleGauge)     echo "Purple with radial arc gauges" ;;
+        SimpleRed)             echo "Red: CPU, RAM, GPU, temperature" ;;
+        SimpleRedFall)         echo "Red, alternate background" ;;
+        SimpleRedGauge)        echo "Red with radial arc gauges" ;;
+        SimpleRedGaugeRedBg)   echo "Red gauges with red background" ;;
+        SimpleWhite)           echo "White: CPU, RAM, GPU, temperature" ;;
+        SimpleWhite-FreeBSD)   echo "White (FreeBSD variant)" ;;
+        SimpleWhiteNas)        echo "White 4-bay NAS: usage, size, temp sparkline" ;;
+        SimpleWhiteNasIO)      echo "White 4-bay NAS: usage, temp, I/O sparkline" ;;
+        SimpleYellow)          echo "Yellow: CPU, RAM, GPU, temperature" ;;
+        SimpleYellowFall)      echo "Yellow, alternate background" ;;
+        SimpleYellowGauge)     echo "Yellow with radial arc gauges" ;;
+        bash-dark-green)       echo "Terminal green-on-black: CPU, RAM, network, disk" ;;
+        bash-dark-green-gpu)   echo "Terminal green-on-black with GPU stats" ;;
+        *)                     echo "" ;;
+    esac
+}
+
+find_theme_conf() {
+    for f in "$THEMES_DIR/$1"/*.conf; do
+        [ -f "$f" ] && echo "$f" && return
+    done
+}
+
+require_root() {
+    if [ "$(id -u)" -ne 0 ]; then
+        echo "Error: 'lcd4linux-theme apply' requires root privileges." >&2
+        echo "Try: sudo lcd4linux-theme apply $1" >&2
+        exit 1
+    fi
+}
+
+cmd_list() {
+    if [ ! -d "$THEMES_DIR" ]; then
+        echo "No themes directory found at $THEMES_DIR" >&2
+        echo "Install the lcd4linux-ax206-themes package." >&2
+        exit 1
+    fi
+
+    echo "Available themes:"
+    echo ""
+    for dir in "$THEMES_DIR"/*/; do
+        [ -d "$dir" ] || continue
+        name=$(basename "$dir")
+        conf=$(find_theme_conf "$name")
+        [ -n "$conf" ] || continue
+        desc=$(get_description "$name")
+        printf "  %-28s %s\n" "$name" "$desc"
+    done
+    echo ""
+    echo "Use 'sudo lcd4linux-theme apply <name>' to activate a theme."
+}
+
+cmd_current() {
+    if [ ! -f "$CONFIG_FILE" ]; then
+        echo "No configuration file found at $CONFIG_FILE"
+        exit 1
+    fi
+    if [ -f "$MARKER_FILE" ]; then
+        theme=$(cat "$MARKER_FILE")
+        echo "Current theme: $theme"
+        if [ "$CONFIG_FILE" -nt "$MARKER_FILE" ]; then
+            echo "  (config has been modified since theme was applied)"
+        fi
+    else
+        echo "No theme applied. Configuration may be manually managed."
+    fi
+}
+
+cmd_apply() {
+    theme_name="$1"
+    if [ -z "$theme_name" ]; then
+        echo "Error: Missing theme name." >&2
+        echo "Usage: lcd4linux-theme apply <name>" >&2
+        echo "Run 'lcd4linux-theme list' to see available themes." >&2
+        exit 1
+    fi
+
+    require_root "$theme_name"
+
+    if [ ! -d "$THEMES_DIR/$theme_name" ]; then
+        echo "Error: Theme '$theme_name' not found." >&2
+        echo "Run 'lcd4linux-theme list' to see available themes." >&2
+        exit 1
+    fi
+
+    conf=$(find_theme_conf "$theme_name")
+    if [ -z "$conf" ]; then
+        echo "Error: No config file found in theme '$theme_name'." >&2
+        exit 1
+    fi
+
+    # Backup existing config if it differs
+    if [ -f "$CONFIG_FILE" ]; then
+        if ! cmp -s "$conf" "$CONFIG_FILE"; then
+            backup="$CONFIG_FILE.bak.$(date +%Y%m%d-%H%M%S)"
+            cp "$CONFIG_FILE" "$backup"
+            echo "Backed up current config to $backup"
+        fi
+    fi
+
+    # Install new config
+    mkdir -p "$CONFIG_DIR"
+    cp "$conf" "$CONFIG_FILE"
+    echo "$theme_name" > "$MARKER_FILE"
+    echo "Applied theme: $theme_name"
+
+    restart_service
+}
+
+usage() {
+    cat <<EOF
+lcd4linux-theme $VERSION — theme manager for lcd4linux-ax206
+
+Usage:
+  lcd4linux-theme list              List available themes
+  lcd4linux-theme apply <name>      Apply a theme (requires root)
+  lcd4linux-theme current           Show the current theme
+  lcd4linux-theme help              Show this help message
+EOF
+}
+
+case "${1:-help}" in
+    list)    cmd_list ;;
+    apply)   shift; cmd_apply "$@" ;;
+    current) cmd_current ;;
+    help|--help|-h) usage ;;
+    *)       echo "Unknown command: $1" >&2; usage; exit 1 ;;
+esac
diff --git a/pkg/freebsd/+MANIFEST.themes b/pkg/freebsd/+MANIFEST.themes
new file mode 100644
index 0000000..777decc
--- /dev/null
+++ b/pkg/freebsd/+MANIFEST.themes
@@ -0,0 +1,18 @@
+name: lcd4linux-ax206-themes
+version: "${VERSION}"
+origin: sysutils/lcd4linux-ax206-themes
+comment: Themes and fonts for lcd4linux-ax206
+maintainer: amd989@users.noreply.github.com
+www: https://github.com/amd989/lcd4linux-ax206
+prefix: /usr/local
+desc: <<EOD
+Collection of 39 pre-built themes with background images and TrueType fonts
+for AX206 USB LCD displays. Includes the lcd4linux-theme CLI for easy
+theme switching.
+EOD
+categories: [sysutils]
+licenselogic: single
+licenses: [GPLv3]
+deps: {
+  lcd4linux-ax206: { origin: sysutils/lcd4linux-ax206, version: "${VERSION}" }
+}
diff --git a/pkg/freebsd/+POST_INSTALL b/pkg/freebsd/+POST_INSTALL
index 5eae2af..1223fc2 100644
--- a/pkg/freebsd/+POST_INSTALL
+++ b/pkg/freebsd/+POST_INSTALL
@@ -7,7 +7,8 @@ echo "Enabling lcd4linux service..."
 sysrc lcd4linux_enable=YES 2>/dev/null || true
 echo ""
 echo "=== lcd4linux-ax206 installed ==="
-echo "  Config:  /usr/local/etc/lcd4linux/lcd4linux.conf"
-echo "  Themes:  /usr/local/share/lcd4linux/themes/"
-echo "  Start:   service lcd4linux start"
-echo "  Status:  service lcd4linux status"
+echo "  Config:   /usr/local/etc/lcd4linux/lcd4linux.conf"
+echo "  Start:    service lcd4linux start"
+echo "  Status:   service lcd4linux status"
+echo ""
+echo "Install themes: pkg install lcd4linux-ax206-themes"
diff --git a/pkg/freebsd/+POST_INSTALL.themes b/pkg/freebsd/+POST_INSTALL.themes
new file mode 100644
index 0000000..a401e2b
--- /dev/null
+++ b/pkg/freebsd/+POST_INSTALL.themes
@@ -0,0 +1,5 @@
+#!/bin/sh
+echo "=== lcd4linux-ax206-themes installed ==="
+echo "  List themes:   lcd4linux-theme list"
+echo "  Apply a theme: lcd4linux-theme apply SimpleBlue"
+echo "  Current theme: lcd4linux-theme current"
diff --git a/pkg/freebsd/build-pkg.sh b/pkg/freebsd/build-pkg.sh
index 9a2d466..59fc46a 100644
--- a/pkg/freebsd/build-pkg.sh
+++ b/pkg/freebsd/build-pkg.sh
@@ -1,47 +1,75 @@
 #!/bin/sh
-# Build a FreeBSD .pkg from the compiled lcd4linux binary
+# Build FreeBSD .pkg files from the compiled lcd4linux binary.
+# Produces two packages:
+#   lcd4linux-ax206-<version>.pkg        — binary + service script
+#   lcd4linux-ax206-themes-<version>.pkg — themes, fonts, lcd4linux-theme CLI
+#
 # Usage: ./build-pkg.sh <version>
 set -e
 
 VERSION="${1:?Usage: build-pkg.sh <version>}"
 PKG_DIR="$(cd "$(dirname "$0")" && pwd)"
 ROOT_DIR="$(cd "$PKG_DIR/../.." && pwd)"
-STAGING="$(mktemp -d)"
 
-trap 'rm -rf "$STAGING"' EXIT
+DIST_DIR="$ROOT_DIR/dist"
+mkdir -p "$DIST_DIR"
 
-# Stage files into pkg layout under prefix /usr/local
-mkdir -p "$STAGING/usr/local/bin"
-mkdir -p "$STAGING/usr/local/etc/rc.d"
-mkdir -p "$STAGING/usr/local/etc/lcd4linux/examples"
+# ---------------------------------------------------------------------------
+# Package 1: lcd4linux-ax206 (binary only)
+# ---------------------------------------------------------------------------
+STAGING_MAIN="$(mktemp -d)"
+trap 'rm -rf "$STAGING_MAIN" "$STAGING_THEMES"' EXIT
 
-# Binary
-cp "$ROOT_DIR/lcd4linux" "$STAGING/usr/local/bin/lcd4linux"
-chmod 755 "$STAGING/usr/local/bin/lcd4linux"
+mkdir -p "$STAGING_MAIN/usr/local/bin"
+mkdir -p "$STAGING_MAIN/usr/local/etc/rc.d"
+mkdir -p "$STAGING_MAIN/usr/local/etc/lcd4linux/examples"
+mkdir -p "$STAGING_MAIN/usr/local/share/lcd4linux"
+touch "$STAGING_MAIN/usr/local/share/lcd4linux/.keep"
 
-# rc.d service script
-cp "$PKG_DIR/rc.d/lcd4linux" "$STAGING/usr/local/etc/rc.d/lcd4linux"
-chmod 755 "$STAGING/usr/local/etc/rc.d/lcd4linux"
+cp "$ROOT_DIR/lcd4linux" "$STAGING_MAIN/usr/local/bin/lcd4linux"
+chmod 755 "$STAGING_MAIN/usr/local/bin/lcd4linux"
 
-# Config examples
-cp "$ROOT_DIR/dpf_320x240.conf" "$STAGING/usr/local/etc/lcd4linux/examples/dpf_320x240.conf"
+cp "$PKG_DIR/rc.d/lcd4linux" "$STAGING_MAIN/usr/local/etc/rc.d/lcd4linux"
+chmod 755 "$STAGING_MAIN/usr/local/etc/rc.d/lcd4linux"
+
+cp "$ROOT_DIR/dpf_320x240.conf" "$STAGING_MAIN/usr/local/etc/lcd4linux/examples/dpf_320x240.conf"
 if [ -f "$ROOT_DIR/lcd4linux.conf.sample" ]; then
-    cp "$ROOT_DIR/lcd4linux.conf.sample" "$STAGING/usr/local/etc/lcd4linux/examples/lcd4linux.conf.sample"
+    cp "$ROOT_DIR/lcd4linux.conf.sample" "$STAGING_MAIN/usr/local/etc/lcd4linux/examples/lcd4linux.conf.sample"
 fi
 
-# Generate plist (file manifest) — paths relative to prefix /usr/local
-PLIST="$(mktemp)"
-(cd "$STAGING/usr/local" && find . -type f | sed 's|^\./||') > "$PLIST"
+PLIST_MAIN="$(mktemp)"
+(cd "$STAGING_MAIN/usr/local" && find . -type f | sed 's|^\./||') > "$PLIST_MAIN"
+
+sed "s/\${VERSION}/$VERSION/g" "$PKG_DIR/+MANIFEST" > "$STAGING_MAIN/+MANIFEST"
+cp "$PKG_DIR/+POST_INSTALL" "$STAGING_MAIN/+POST_INSTALL"
+cp "$PKG_DIR/+POST_DEINSTALL" "$STAGING_MAIN/+POST_DEINSTALL"
+
+pkg create -m "$STAGING_MAIN" -r "$STAGING_MAIN" -p "$PLIST_MAIN" -o "$DIST_DIR/"
+rm -f "$PLIST_MAIN"
+
+# ---------------------------------------------------------------------------
+# Package 2: lcd4linux-ax206-themes (themes, fonts, lcd4linux-theme CLI)
+# ---------------------------------------------------------------------------
+STAGING_THEMES="$(mktemp -d)"
+
+mkdir -p "$STAGING_THEMES/usr/local/bin"
+mkdir -p "$STAGING_THEMES/usr/local/share/lcd4linux"
+
+cp "$ROOT_DIR/lcd4linux-theme" "$STAGING_THEMES/usr/local/bin/lcd4linux-theme"
+chmod 755 "$STAGING_THEMES/usr/local/bin/lcd4linux-theme"
+
+cp -r "$ROOT_DIR/themes" "$STAGING_THEMES/usr/local/share/lcd4linux/themes"
+cp -r "$ROOT_DIR/fonts" "$STAGING_THEMES/usr/local/share/lcd4linux/fonts"
+
+PLIST_THEMES="$(mktemp)"
+(cd "$STAGING_THEMES/usr/local" && find . -type f | sed 's|^\./||') > "$PLIST_THEMES"
 
-# Generate manifest with version substituted
-sed "s/\${VERSION}/$VERSION/" "$PKG_DIR/+MANIFEST" > "$STAGING/+MANIFEST"
-cp "$PKG_DIR/+POST_INSTALL" "$STAGING/+POST_INSTALL"
-cp "$PKG_DIR/+POST_DEINSTALL" "$STAGING/+POST_DEINSTALL"
+sed "s/\${VERSION}/$VERSION/g" "$PKG_DIR/+MANIFEST.themes" > "$STAGING_THEMES/+MANIFEST"
+cp "$PKG_DIR/+POST_INSTALL.themes" "$STAGING_THEMES/+POST_INSTALL"
 
-# Build the package
-mkdir -p "$ROOT_DIR/dist"
-pkg create -m "$STAGING" -r "$STAGING" -p "$PLIST" -o "$ROOT_DIR/dist/"
+pkg create -m "$STAGING_THEMES" -r "$STAGING_THEMES" -p "$PLIST_THEMES" -o "$DIST_DIR/"
+rm -f "$PLIST_THEMES"
 
-rm -f "$PLIST"
-echo "Package created in $ROOT_DIR/dist/"
-ls -lh "$ROOT_DIR/dist/"*.pkg 2>/dev/null || echo "Warning: no .pkg file found"
+# ---------------------------------------------------------------------------
+echo "Packages created in $DIST_DIR/"
+ls -lh "$DIST_DIR/"*.pkg 2>/dev/null || echo "Warning: no .pkg files found"
diff --git a/pkg/freebsd/rc.d/lcd4linux b/pkg/freebsd/rc.d/lcd4linux
index 3f1a851..21f707e 100644
--- a/pkg/freebsd/rc.d/lcd4linux
+++ b/pkg/freebsd/rc.d/lcd4linux
@@ -15,6 +15,9 @@ rcvar="lcd4linux_enable"
 command="/usr/local/bin/lcd4linux"
 command_args="-F -f ${lcd4linux_config}"
 
+# Working directory for resolving relative theme paths (fonts/, themes/)
+: ${lcd4linux_chdir:="/usr/local/share/lcd4linux"}
+
 pidfile="/var/run/${name}.pid"
 start_cmd="lcd4linux_start"
 stop_cmd="lcd4linux_stop"
@@ -23,11 +26,11 @@ lcd4linux_start()
 {
     if [ ! -f "${lcd4linux_config}" ]; then
         echo "Error: ${lcd4linux_config} not found."
-        echo "Copy an example: cp /usr/local/etc/lcd4linux/examples/dpf_320x240.conf ${lcd4linux_config}"
+        echo "Run: lcd4linux-theme apply SimpleBlue"
         return 1
     fi
     echo "Starting ${name}."
-    /usr/sbin/daemon -p ${pidfile} -f ${command} ${command_args}
+    /usr/sbin/daemon -p ${pidfile} -f /bin/sh -c "cd '${lcd4linux_chdir}' && exec ${command} ${command_args}"
 }
 
 lcd4linux_stop()
diff --git a/rpm/lcd4linux-ax206.spec b/rpm/lcd4linux-ax206.spec
index fe65acb..7962819 100644
--- a/rpm/lcd4linux-ax206.spec
+++ b/rpm/lcd4linux-ax206.spec
@@ -33,6 +33,16 @@ and renders widgets onto the display.
 Features include pixel-level brightness control, VNC mirror display support,
 TrueType font rendering, and graphical bar widgets with color thresholds.
 
+%package themes
+Summary:        Themes and fonts for lcd4linux-ax206
+BuildArch:      noarch
+Requires:       lcd4linux-ax206
+
+%description themes
+Collection of 39 pre-built themes with background images and TrueType fonts
+for AX206 USB LCD displays. Includes a theme management CLI (lcd4linux-theme)
+for easy theme switching.
+
 %prep
 %setup -q
 # automake in gnu mode requires README; project uses README.md
@@ -46,10 +56,14 @@ make %{?_smp_mflags}
 
 %install
 install -D -m 0755 lcd4linux %{buildroot}%{_bindir}/lcd4linux
+install -D -m 0755 lcd4linux-theme %{buildroot}%{_bindir}/lcd4linux-theme
 install -D -m 0644 dpf_320x240.conf %{buildroot}%{_sysconfdir}/lcd4linux/examples/dpf_320x240.conf
 install -D -m 0644 lcd4linux.conf.sample %{buildroot}%{_sysconfdir}/lcd4linux/examples/lcd4linux.conf.sample
 install -D -m 0644 debian/lcd4linux-ax206.service %{buildroot}%{_unitdir}/lcd4linux-ax206.service
 install -D -m 0644 dpf_320x240.conf %{buildroot}%{_sysconfdir}/lcd4linux/lcd4linux.conf
+mkdir -p %{buildroot}%{_datadir}/lcd4linux
+cp -r themes %{buildroot}%{_datadir}/lcd4linux/themes
+cp -r fonts %{buildroot}%{_datadir}/lcd4linux/fonts
 
 %files
 %license COPYING
@@ -58,8 +72,14 @@ install -D -m 0644 dpf_320x240.conf %{buildroot}%{_sysconfdir}/lcd4linux/lcd4lin
 %{_unitdir}/lcd4linux-ax206.service
 %dir %{_sysconfdir}/lcd4linux
 %dir %{_sysconfdir}/lcd4linux/examples
+%dir %{_datadir}/lcd4linux
 %config(noreplace) %{_sysconfdir}/lcd4linux/lcd4linux.conf
 %config %{_sysconfdir}/lcd4linux/examples/*.conf
 %config %{_sysconfdir}/lcd4linux/examples/*.sample
 
+%files themes
+%{_bindir}/lcd4linux-theme
+%{_datadir}/lcd4linux/themes
+%{_datadir}/lcd4linux/fonts
+
 %changelog
diff --git a/themes/README.md b/themes/README.md
index c4e75f5..5e0be22 100644
--- a/themes/README.md
+++ b/themes/README.md
@@ -2,7 +2,22 @@
 
 35+ ready-to-use themes for the AX206 3.5" USB display. Each folder contains a `.conf` file and a `preview.png`.
 
-To use a theme, point lcd4linux at its config file:
+## Applying a Theme
+
+**If you installed the `lcd4linux-ax206-themes` package**, use the `lcd4linux-theme` CLI:
+
+```bash
+# List all available themes
+lcd4linux-theme list
+
+# Apply a theme (backs up your current config automatically)
+sudo lcd4linux-theme apply SimpleBlue
+
+# Check what's currently active
+lcd4linux-theme current
+```
+
+**If you're running from source**, point lcd4linux directly at the config file:
 
 ```bash
 ./lcd4linux -F -f themes/<ThemeName>/<config>.conf
diff --git a/themes/SimpleOrangeFall/dpf_simpleorangefall.conf b/themes/SimpleOrangeFall/dpf_simpleorangefall.conf
index 3bb3ea0..f43dd4a 100644
--- a/themes/SimpleOrangeFall/dpf_simpleorangefall.conf
+++ b/themes/SimpleOrangeFall/dpf_simpleorangefall.conf
@@ -14,7 +14,7 @@ Display dpf {
 }
 
 # ---------------------------------------------------------------
-# SimpleOarngeFall theme — 320x480 portrait
+# SimpleOrangeFall theme — 320x480 portrait
 # 4 sections: CPU%, RAM%, GPU%, CPU Temp
 #
 # COORDINATE MAPPING for portrait mode (Orientation 1):
@@ -33,7 +33,7 @@ Display dpf {
 # Background image (orange fall boxes on black)
 Widget Background {
     class 'Image'
-    file 'themes/SimpleOarngeFall/background.png'
+    file 'themes/SimpleOrangeFall/background.png'
     reload 0
     update 0
     visible 1