diff --git a/home-manager/common/desktops/hyprland/components/hyprland.nix b/home-manager/common/desktops/hyprland/components/hyprland.nix
index 291134e0..0a487a21 100644
--- a/home-manager/common/desktops/hyprland/components/hyprland.nix
+++ b/home-manager/common/desktops/hyprland/components/hyprland.nix
@@ -1,6 +1,9 @@
-{ ... }: {
+{ inputs, ... }: {
   wayland.windowManager.hyprland = {
     enable = true;
+    plugins = [
+      inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix
+    ];
     extraConfig = ''
       # Resize
       bind = SUPER, R, exec, notify-send 'Entered resize mode.  Press ESC to quit.'
@@ -85,9 +88,9 @@
       master.new_is_master = true;
       windowrule = [
         "noblur,^(firefox)$" # disables blur for firefox
-        "opacity 1.0 override,^(firefox)$"
+        "opacity 1.0 override,^(firefox)$" # Sets opacity to 1
         "noblur,^(steam)$" # disables blur for steam
-        "opacity 1.0 override,^(steam)$"
+        "opacity 1.0 override,^(steam)$" # Sets opacity to 1
       ];
       bind = [
       ''SUPER, Q, exec, kitty''
@@ -163,8 +166,8 @@
       ];
       bindm = [
         # Move/resize windows with mainMod + LMB/RMB and dragging
-        ''SUPER, mouse:272, movewindow''
-        ''SUPER, mouse:273, resizewindow''
+        ''SHIFT, mouse:272, movewindow''
+        ''SHIFT, mouse:273, resizewindow''
       ];
 
       exec-once = ''bash ~/.config/hypr/start.sh'';
diff --git a/home-manager/common/desktops/hyprland/components/mako.nix b/home-manager/common/desktops/hyprland/components/mako.nix
index 4ae96482..8bbc14eb 100644
--- a/home-manager/common/desktops/hyprland/components/mako.nix
+++ b/home-manager/common/desktops/hyprland/components/mako.nix
@@ -1,7 +1,7 @@
 { ... }: {
   services.mako = {
     enable = true;
-    anchor = "top-center";
+    anchor = "top-right";
     borderRadius = 2;
     borderSize = 2;
     icons = true;
@@ -19,7 +19,7 @@
       max-icon-size=128
       icon-location=left
       history=1
-      text-alignment=center
+      text-alignment=left
     '';
   };
 }
diff --git a/home-manager/common/desktops/hyprland/components/waybar.nix b/home-manager/common/desktops/hyprland/components/waybar.nix
index 3034f4f1..c162c502 100644
--- a/home-manager/common/desktops/hyprland/components/waybar.nix
+++ b/home-manager/common/desktops/hyprland/components/waybar.nix
@@ -11,13 +11,14 @@
                 "custom/wlogout"
                 "idle_inhibitor"
                 "clock"
-                "hyprland/submap"
+                "cava"
                 "mpris"
             ];
             modules-center = [
                 "hyprland/workspaces"
             ];
             modules-right = [
+                "hyprland/submap"
                 "pulseaudio"
                 "custom/tailscale"
                 "network"
@@ -50,7 +51,7 @@
             mpris = {
                 format = "{player_icon} {dynamic}";
                 format-paused = ''{status_icon} <i>{dynamic}</i>'';
-                player-icons = { default = "▶"; };
+                player-icons = { default = "▶ "; };
                 status-icons = { paused =  "⏸"; };
                 max-length = 30;
             };
@@ -127,6 +128,7 @@
         * {
             border: none;
             border-radius: 0;
+
         }
 
         #waybar {
diff --git a/home-manager/common/desktops/hyprland/themes/tokyo.nix b/home-manager/common/desktops/hyprland/themes/tokyo-night.nix
similarity index 100%
rename from home-manager/common/desktops/hyprland/themes/tokyo.nix
rename to home-manager/common/desktops/hyprland/themes/tokyo-night.nix
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index 01f7e98e..25770728 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -131,6 +131,8 @@
     pkgs.pulsemixer           # TUI Pipewire  / volume management
     pkgs.calcurse             # TUI Calendar app
     pkgs.udiskie              # Automatic device mounting
+    pkgs.cava                 # Audio visualiser
+    pkgs.pyradio              # Internet radio TUI
 
     # Themes
     pkgs.gruvbox-gtk-theme    # Gruvbox Theme
diff --git a/nixos/common/desktops/hyprland/themes/tokyo.nix b/nixos/common/desktops/hyprland/themes/tokyo-night.nix
similarity index 100%
rename from nixos/common/desktops/hyprland/themes/tokyo.nix
rename to nixos/common/desktops/hyprland/themes/tokyo-night.nix
diff --git a/nixos/default.nix b/nixos/default.nix
index 1193c6c9..ac93ed7d 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -58,6 +58,7 @@
     sshpass      # ssh password helper
     cbonsai      # ncurses bonsai tree
     busybox      # Linux utilities
+    ethtool      # Ethernet troubleshooting
   ];
 
   # Select internationalisation properties.