diff --git a/bootstrap.sh b/bootstrap.sh
index bde98af..140aefe 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -12,7 +12,7 @@ echo ""
 # Configuration variables
 GIT_REPO="https://git.cribdev.com/crib/nixos-config.git"
 CONFIG_DIR="$HOME/.config/nixos"
-HOSTNAME=$(cribnix)
+HOSTNAME=$(HOSTNAME)
 
 # Colors
 RED='\033[0;31m'
diff --git a/configuration.nix b/configuration.nix
index 10065bc..f0fed9d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,6 +11,11 @@
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/sda";
 
+  # For systemd boot
+  #boot.loader.systemd-boot.enable = true;
+  #boot.loader.efi.canTouchEfiVariables = true;
+
+
   # Networking
   networking.hostName = "MYHOST";
   networking.networkmanager.enable = true;
@@ -38,7 +43,7 @@
   # User account
   users.users.YOURUSERNAME = {
     isNormalUser = true;
-    description = "Crib";
+    description = "User";
     extraGroups = [ "networkmanager" "wheel" "video" "audio" ];
     shell = pkgs.zsh;
   };
diff --git a/flake.nix b/flake.nix
index 3f89105..d0a678a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.crib = import ./home/home.nix;
+            home-manager.users.YOURUSERNAME = import ./home/home.nix;
             home-manager.extraSpecialArgs = { inherit inputs; };
           }
         ];
diff --git a/home/hyprland.nix b/home/hyprland.nix
index f2eaf48..cbb10f2 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -12,7 +12,7 @@
       # Startup applications
       exec-once = [
         "waybar"
-        "swaync"
+        "swaynotificationcenter"
         "swww init"
         "nm-applet --indicator"
         "blueman-applet"
diff --git a/home/rofi.nix b/home/rofi.nix
index 1e2d338..854f3bb 100644
--- a/home/rofi.nix
+++ b/home/rofi.nix
@@ -3,7 +3,7 @@
 {
   programs.rofi = {
     enable = true;
-    package = pkgs.rofi-wayland;
+    package = pkgs.rofi;
     
     theme = let
       inherit (config.lib.formats.rasi) mkLiteral;
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index fdbd144..e245405 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -19,11 +19,11 @@
     hyprlock        # Screen locker
     
     # Wayland essentials  
-    waybar          # Status bar
-    rofi-wayland    # Application launcher (vyrx uses Rofi)
-    dunst           # Notification daemon
-    swww            # Wallpaper daemon
-    swaync          # Notification center (vyrx uses this)
+    waybar                   # Status bar
+    rofi                     # Application launcher (vyrx uses Rofi)
+    dunst                    # Notification daemon
+    swww                     # Wallpaper daemon
+    swaynotificationcenter   # Notification center (vyrx uses this)
     
     # Screenshot and recording
     grim            # Screenshot tool