diff --git a/configuration.nix b/configuration.nix
index 549a94d..07a5238 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -25,10 +25,7 @@
       defaultEditor = true;
      };
 
-  # For gnome-disks to work
-  services.udisks2.enable = true;
-  # SSH services
-  programs.ssh.startAgent = true;
+  
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
@@ -60,7 +57,7 @@
     backupFileExtension = "not-nix"; # Add this line
     users.jeremy = { pkgs, ... }: {
       home.stateVersion = "25.11";
-      wayland.windowManager.hyprland = {
+      wayland.windowManager.hyprland = { # Configure hyprland
         enable = true;
         settings = {
           general = {
@@ -141,7 +138,7 @@
           ];
         };
       };
-	    programs.neovim = {
+	    programs.neovim = { # Configure nvim
       	enable = true;
       	extraConfig = ''
 	    	set number relativenumber
@@ -152,13 +149,30 @@
 	    	set cc=80
 	    	'';
       };
-      programs.vscode = {
+      programs.vscode = { # Configure vscodium
         enable = true;
         package = pkgs.vscodium;
         profiles.default.extensions = with pkgs.vscode-extensions; [
-          jnoortheen.nix-ide
+          jnoortheen.nix-ide # NIX syntax highlighting. Also uses nixfmt package
         ];
       };
+      programs.rofi = { # Rofi config
+        enable = true;
+        theme = "dmenu";
+        font = "sans-serif";
+        package = pkgs.rofi;
+        modes = [
+          "drun"
+          "run"
+          "window"
+          "ssh"  
+        ];
+        extraConfig = {
+          show-icons = true;
+        };
+      };
+      # programs.waybar.enable = true;
+      # xdg.configFile."waybar/config.jsonc".source = ./waybar/config;
     };
   };
 
@@ -183,6 +197,7 @@
       swaybg # wallpaper
       nixfmt # nix file formatting
       openrgb # RGB editor
+      furmark # Room heater
     ];
   };
 
@@ -194,7 +209,6 @@
    networkmanager
    gnome-disk-utility
 
-   waybar
    dunst
    libnotify
    rofi
@@ -221,8 +235,21 @@
     powerOnBoot = true;
   };
 
+  
   services.pulseaudio.enable = false; # Use Pipewire
   security.rtkit.enable = true; # Enable RealtimeKit for audio purposes
+  services.hardware.openrgb = { # Enable OpenRGB
+    enable = true; 
+    package = pkgs.openrgb-with-all-plugins; 
+    motherboard = "amd"; 
+    server.port = 6742;
+  };
+  services.udisks2.enable = true; # Enable gnome-disks
+  services.displayManager.sddm.enable = true; # Enable display manager
+  services.displayManager.sddm.wayland.enable = true; # Wayland - hyprland
+
+  programs.ssh.startAgent = true; # Enable SSH tools
+  programs.thunar.enable = true; # file manager
 
 
  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
@@ -230,12 +257,9 @@
     "steam-original"
     "steam-unwrapped"
     "steam-run"
+    "furmark"
   ];
 
-  services.displayManager.sddm.enable = true;
-  services.displayManager.sddm.wayland.enable = true;
-
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -244,14 +268,12 @@
   #   enableSSHSupport = true;
   # };
 
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
+  # Enable OpenSSH daemon
   services.openssh = {
     enable = true;
   };  
 
- # Configure bootloader device
+ # bootloader device
   boot.loader.grub.device = "/dev/sda";
 
   # Open ports in the firewall.
@@ -283,7 +305,4 @@
   #
   # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
   system.stateVersion = "25.11"; # Did you read the comment?
-
 }
-
-