diff --git a/configuration.nix b/configuration.nix
index 0e8336a..a2972e4 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ ... }:
 {
   imports = [
     <home-manager/nixos>
diff --git a/home-manager/audio.nix b/home-manager/media.nix
similarity index 51%
rename from home-manager/audio.nix
rename to home-manager/media.nix
index 8af11ee..4a2cd3c 100644
--- a/home-manager/audio.nix
+++ b/home-manager/media.nix
@@ -1,6 +1,9 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs; [ spotify ];
+  home.packages = with pkgs; [
+    spotify
+    mplayer
+  ];
   programs.cava = {
     enable = true;
   };
diff --git a/nixos/gaming.nix b/nixos/gaming.nix
new file mode 100644
index 0000000..de1a7ff
--- /dev/null
+++ b/nixos/gaming.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
+  };
+}
diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix
index c76c7b2..60930ea 100644
--- a/nixos/hyprland.nix
+++ b/nixos/hyprland.nix
@@ -2,7 +2,6 @@
 {
   programs.hyprland = {
     enable = true;
-    #xwayland.enable = true;
   };
   programs.hyprlock.enable = true;
   services.hypridle.enable = true;
@@ -11,11 +10,20 @@
   environment.systemPackages = with pkgs; [
     hyprcursor
     waybar
+    # Apps
     rofi-wayland
+    # Notifications
     swaynotificationcenter
+    inotify-tools
+    # Wallpaper
     swww
     pywal
+    # Emoji
     emote
+    # Screenshots
+    grim
+    slurp
+    swappy
   ];
 
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
diff --git a/nixos/audio.nix b/nixos/media.nix
similarity index 100%
rename from nixos/audio.nix
rename to nixos/media.nix
diff --git a/nixos/nixos.nix b/nixos/nixos.nix
index 0a2905b..6beddc3 100644
--- a/nixos/nixos.nix
+++ b/nixos/nixos.nix
@@ -14,10 +14,11 @@ in
     ./system.nix
     ./network.nix
     ./nvidia.nix
-    ./audio.nix
+    ./media.nix
     ./services.nix
     ./shell.nix
     ./hyprland.nix
+    ./gaming.nix
   ];
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -47,8 +48,8 @@ in
       home.username = username;
       home.homeDirectory = "/home/${username}";
       imports = [
-        ../home-manager/audio.nix
         ../home-manager/hyprland.nix
+        ../home-manager/media.nix
         ../home-manager/nvim.nix
         ../home-manager/terminal.nix
         ./home.nix
@@ -62,27 +63,13 @@ in
     # System
     gcc
     cmake
-    sass
     unzip
     ffmpeg
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
-    inotify-tools
     killall
-    brightnessctl
-    fd
-    # Screenshots
-    grim
-    slurp
-    swappy
   ];
 
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
-  };
-
   # Copy the NixOS configuration file and link it from the resulting system
   # (/run/current-system/configuration.nix). This is useful in case you
   # accidentally delete configuration.nix.