diff --git a/build/10-build.sh b/build/10-build.sh
index bda9e96..210598f 100755
--- a/build/10-build.sh
+++ b/build/10-build.sh
@@ -5,9 +5,6 @@ set -eoux pipefail
 ###############################################################################
 # Main Build Script
 ###############################################################################
-# This script follows the @ublue-os/bluefin pattern for build scripts.
-# It uses set -eoux pipefail for strict error handling and debugging.
-###############################################################################
 
 # Source helper functions
 # shellcheck source=/dev/null
@@ -18,24 +15,19 @@ shopt -s nullglob
 
 echo "::group:: Copy Bluefin Config from Common"
 
-# Copy just files from @projectbluefin/common (includes 00-entry.just which imports 60-custom.just)
 mkdir -p /usr/share/ublue-os/just/
-shopt -s nullglob
 cp -r /ctx/oci/common/bluefin/usr/share/ublue-os/just/* /usr/share/ublue-os/just/
-shopt -u nullglob
 
 echo "::endgroup::"
 
 echo "::group:: Copy Custom Files"
 
-# Copy Brewfiles to standard location
 mkdir -p /usr/share/ublue-os/homebrew/
 cp /ctx/custom/brew/*.Brewfile /usr/share/ublue-os/homebrew/
 
-# Consolidate Just Files
-find /ctx/custom/ujust -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just
+find /ctx/custom/ujust -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; \
+  >> /usr/share/ublue-os/just/60-custom.just
 
-# Copy Flatpak preinstall files
 mkdir -p /etc/flatpak/preinstall.d/
 cp /ctx/custom/flatpaks/*.preinstall /etc/flatpak/preinstall.d/
 
@@ -43,26 +35,45 @@ echo "::endgroup::"
 
 echo "::group:: Install Packages"
 
-# Install packages using dnf5
+# Base utilities
 dnf5 install -y \
-fastfetch \
-btop \
+  fastfetch \
+  btop
 
+# Hyprland über COPR (isoliert)
+copr_install_isolated "ashbuk/Hyprland-Fedora" \
+  hyprland \
+  xdg-desktop-portal-hyprland
 
-# Example using COPR with isolated pattern:
-copr_install_isolated "ryanabx/cosmic-epoch" cosmic-desktop
+# Quickshell + Desktop-Basis aus Fedora
+dnf5 install -y \
+  quickshell \
+  hyprpaper \
+  hypridle \
+  hyprlock \
+  foot \
+  fuzzel \
+  wlogout \
+  xdg-desktop-portal-gtk \
+  network-manager-applet
+
+# Laptop-spezifische Komponenten
+dnf5 install -y \
+  power-profiles-daemon \
+  upower \
+  bluez \
+  bluez-tools \
+  blueman
 
 echo "::endgroup::"
 
 echo "::group:: System Configuration"
 
-# Enable/disable systemd services
 systemctl enable podman.socket
-# Example: systemctl mask unwanted-service
+systemctl enable bluetooth.service
 
 echo "::endgroup::"
 
-# Restore default glob behavior
 shopt -u nullglob
 
 echo "Custom build complete!"