diff --git a/justfile b/justfile
index 91f04bb..eb63d06 100644
--- a/justfile
+++ b/justfile
@@ -46,7 +46,7 @@ httpgw:
 
 webui:
     @echo === Building ollie-webui ===
-    cd webui && npm run build
+    just -f webui/justfile webui
 
 ollie-remote:
 	rm -rf cmd/ollie-remote/tools && cp -a contrib/tools cmd/ollie-remote/tools
@@ -54,14 +54,12 @@ ollie-remote:
 	go build -buildvcs=false -o {{bin}}/ollie-remote ./cmd/ollie-remote/
 
 kde:
-    @echo === Building kde tools ===
-    cd kde && cmake -B build-cmake -S . -DCMAKE_INSTALL_PREFIX=~/.local
-    cd kde && cmake --build build-cmake -j$(nproc)
+    @echo === Building ollie-kde ===
+    just -f kde/justfile kde
 
 kde-kf5:
-    @echo === Building kde tools \(KF5\) ===
-    cd kde && cmake -B build-kf5 -S . -DOLLIE_KF5=ON -DCMAKE_INSTALL_PREFIX=~/.local
-    cd kde && cmake --build build-kf5 -j$(nproc)
+    @echo === Building ollie-kde (KF5) ===
+    just -f kde/justfile kde-kf5
 
 # === Install targets ===
 
@@ -76,46 +74,12 @@ install-kf5: test install-data install-scripts install-contrib install-kde-kf5 i
     @echo 'Restart Plasma to pick up KDE plugins.'
 
 install-kde:
-    @echo === Installing ollie-kde \(KF6\) ===
-    cmake --install kde/build-cmake
-    # Desktop file and icon
-    mkdir -p ~/.local/share/applications
-    install -m644 kde/gui/org.ollie.gui.desktop ~/.local/share/applications/
-    mkdir -p ~/.local/share/icons/hicolor/scalable/apps
-    install -m644 kde/gui/ollie.svg ~/.local/share/icons/hicolor/scalable/apps/ollie.svg
-    # Dolphin service menus + helper scripts
-    mkdir -p ~/.local/share/kio/servicemenus
-    install -m755 kde/dolphin/ollie-actions.desktop ~/.local/share/kio/servicemenus/
-    install -m755 kde/dolphin/ollie-ask ~/.local/bin/
-    install -m755 kde/dolphin/ollie-session-here ~/.local/bin/
-    # Plasma session environment
-    mkdir -p ~/.config/plasma-workspace/env
-    install -m755 kde/99-ollie.sh ~/.config/plasma-workspace/env/99-ollie.sh
-    # Finalize
-    kbuildsycoca6 --noincremental 2>/dev/null; true
-    kquitapp6 krunner 2>/dev/null; true
-    @echo === KDE install complete. Restart Plasma to pick up plugins. ===
+    @echo === Installing ollie-kde (KF6) ===
+    just -f kde/justfile install-kde
 
 install-kde-kf5:
-    @echo === Installing ollie-kde \(KF5\) ===
-    cmake --install kde/build-kf5
-    # Desktop file and icon
-    mkdir -p ~/.local/share/applications
-    install -m644 kde/gui/org.ollie.gui.desktop ~/.local/share/applications/
-    mkdir -p ~/.local/share/icons/hicolor/scalable/apps
-    install -m644 kde/gui/ollie.svg ~/.local/share/icons/hicolor/scalable/apps/ollie.svg
-    # Dolphin service menus + helper scripts
-    mkdir -p ~/.local/share/kio/servicemenus
-    install -m755 kde/dolphin/ollie-actions-kf5.desktop ~/.local/share/kio/servicemenus/ollie-actions.desktop
-    install -m755 kde/dolphin/ollie-ask ~/.local/bin/
-    install -m755 kde/dolphin/ollie-session-here ~/.local/bin/
-    # Plasma session environment
-    mkdir -p ~/.config/plasma-workspace/env
-    install -m755 kde/99-ollie-kf5.sh ~/.config/plasma-workspace/env/99-ollie.sh
-    # Finalize
-    kbuildsycoca5 --noincremental 2>/dev/null; true
-    kquitapp5 krunner 2>/dev/null; true
-    @echo === KDE KF5 install complete. Restart Plasma to pick up plugins. ===
+    @echo === Installing ollie-kde (KF5) ===
+    just -f kde/justfile install-kde-kf5
 
 install-el:
     @echo === Installing ellie.el ===
@@ -263,16 +227,7 @@ uninstall:
     rm -f ~/.config/systemd/user/ollie.service
     rm -f ~/.config/autostart/org.ollie.olliesrv.desktop
     # KDE (KF6)
-    rm -f ~/.local/bin/ollie-tray ~/.local/bin/ollie-gui
-    rm -f ~/.local/bin/ollie-ask ~/.local/bin/ollie-session-here
-    rm -f ~/.local/share/applications/org.ollie.gui.desktop
-    rm -f ~/.local/share/icons/hicolor/scalable/apps/ollie.svg
-    rm -f ~/.local/lib64/qt6/plugins/kf6/krunner/krunner_ollie.so
-    rm -f ~/.local/lib64/qt6/plugins/ktexteditor/ollie_kate.so
-    rm -rf ~/.local/share/plasma/plasmoids/org.ollie.plasmoid
-    rm -rf ~/.local/lib64/qml/org/ollie
-    rm -f ~/.local/share/kio/servicemenus/ollie-actions.desktop
-    kquitapp6 krunner 2>/dev/null; true
+    just -f kde/justfile uninstall
     # Emacs
     rm -rf ~/.config/emacs/ellie
     # Plasma env
@@ -289,17 +244,7 @@ uninstall-kf5:
     rm -f ~/.config/systemd/user/ollie.service
     rm -f ~/.config/autostart/org.ollie.olliesrv.desktop
     # KDE (KF5)
-    rm -f ~/.local/bin/ollie-tray ~/.local/bin/ollie-gui
-    rm -f ~/.local/bin/ollie-ask ~/.local/bin/ollie-session-here
-    rm -f ~/.local/share/applications/org.ollie.gui.desktop
-    rm -f ~/.local/share/icons/hicolor/scalable/apps/ollie.svg
-    rm -f ~/.local/share/kio/servicemenus/ollie-actions.desktop
-    rm -f ~/.local/lib/qt5/plugins/kf5/krunner/krunner_ollie.so
-    rm -f ~/.local/lib/qt5/plugins/ktexteditor/ollie_kate.so
-    rm -rf ~/.local/share/plasma/plasmoids/org.ollie.plasmoid
-    rm -f ~/.local/share/metainfo/org.ollie.plasmoid.appdata.xml
-    rm -rf ~/.local/lib/x86_64-linux-gnu/qml/org/ollie
-    kquitapp5 krunner 2>/dev/null; true
+    just -f kde/justfile uninstall-kf5
     # Emacs
     rm -rf ~/.config/emacs/ellie
     # Plasma env
@@ -329,7 +274,7 @@ clean:
     rm -f {{bin}}/ollie-httpgw
     rm -f {{bin}}/Ollie {{bin}}/Kmpl {{bin}}/Oi {{bin}}/Theo
     rm -f {{bin}}/ollie-remote
-    rm -rf kde/build-cmake kde/build-kf5
+    just -f kde/justfile clean
 
 # === Help ===