diff --git a/modules/home/alacritty.nix b/modules/home/alacritty.nix
deleted file mode 100644
index 1e33336..0000000
--- a/modules/home/alacritty.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  ...
-}:
-{
-  programs.alacritty = {
-    enable = true;
-    theme = "catppuccin_mocha";
-    settings = {
-      font = {
-        normal = {
-          family = "FiraCode Nerd Font";
-          style = "Regular";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 4686a76..fee400b 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -3,11 +3,9 @@
 }:
 {
   imports = [
-    # ./alacritty.nix
     ./firefox.nix
     ./ghostty.nix
     ./git.nix
-    # ./kitty.nix
     ./hypr
     ./mango.nix
     ./nvf.nix
diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix
index 6bcf7af..728d932 100644
--- a/modules/home/firefox.nix
+++ b/modules/home/firefox.nix
@@ -18,6 +18,7 @@
       DisableProfileImport = true;
       DisableProfileRefresh = true;
       DisableTelemetry = true;
+      DisplayBookmarksToolbar = "never";
       DontCheckDefaultBrowser = true;
       EnableTrackingProtection = {
         Value = true; # Tracking protection is enabled by default in both the regular browser and private browsing
diff --git a/modules/home/ghostty.nix b/modules/home/ghostty.nix
index 58293ae..a691eb9 100644
--- a/modules/home/ghostty.nix
+++ b/modules/home/ghostty.nix
@@ -6,7 +6,6 @@
     enable = true;
     enableZshIntegration = true;
     settings = {
-      theme = "Catppuccin Mocha";
       term = "xterm-256color";
     };
     systemd.enable = true;
diff --git a/modules/home/hypr/hyprland.nix b/modules/home/hypr/hyprland.nix
index 2f34b12..421e8c3 100644
--- a/modules/home/hypr/hyprland.nix
+++ b/modules/home/hypr/hyprland.nix
@@ -18,9 +18,13 @@
         "${config.xdg.configHome}/hypr/monitors.conf"
       ];
 
-      # monitor = [
-      #   "eDP-1, 2256x1504@60, 0x0, 1"
-      # ];
+      general = {
+        gaps_in = 5;
+        gaps_out = 10;
+        border_size = 2;
+        "col.active_border" = "rgb(4479A4)";
+        "col.inactive_border" = "rgba(4479A480)";
+      };
 
       decoration = {
         rounding = 10;
@@ -37,6 +41,12 @@
         };
       };
 
+      layerrule = [
+        "blur, waybar" # Add blur to waybar
+        "blurpopups, waybar" # Blur waybar popups too!
+        "ignorealpha 0.2, waybar" # Make it so transparent parts are ignored
+      ];
+
       exec-once = [
         "systemctl --user enable --now hyprpolkitagent.service"
         "wpaperd -d"
diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix
deleted file mode 100644
index 8068c6c..0000000
--- a/modules/home/kitty.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  ...
-}:
-{
-  programs.kitty = {
-    enable = true;
-    enableGitIntegration = true;
-    font = {
-      name = "FiraCode Nerd Font";
-    };
-    shellIntegration.enableZshIntegration = true;
-    themeFile = "Catppuccin-Mocha";
-  };
-}
diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix
index 39efc6c..89e24da 100644
--- a/modules/home/stylix.nix
+++ b/modules/home/stylix.nix
@@ -13,45 +13,31 @@
     autoEnable = false;
     polarity = "dark";
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-    targets = {
-      # firefox = {
-      #   enable = true;
-      #   colorTheme.enable = true;
-      #   firefoxGnomeTheme.enable = true;
-      #   profileNames = [ "eclypse" ];
-      # };
-      # gtk = {
-      #   enable = true;
-      # };
-      qt = {
-        enable = true;
+    fonts = {
+      monospace = {
+        name = "FiraCode Nerd Font";
+        package = pkgs.nerd-fonts.fira-code;
       };
     };
+    targets = {
+      alacritty.enable = true;
+      ghostty.enable = true;
+      firefox = {
+        enable = true;
+        profileNames = [ "eclypse" ];
+        colorTheme.enable = true;
+        firefoxGnomeTheme.enable = true;
+      };
+      lazygit.enable = true;
+      yazi.enable = true;
+    };
   };
 
   home.pointerCursor = {
-    gtk.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Ice";
-    size = 17;
-  };
-
-  gtk = {
     enable = true;
-    colorScheme = "dark";
-    theme = {
-      name = "Tokyonight-Dark";
-      package = pkgs.tokyonight-gtk-theme.override {
-        tweakVariants = [ "macos" ];
-      };
-    };
+    gtk.enable = true;
+    name = "Catppuccin-Mocha-Dark-Cursors";
+    package = pkgs.catppuccin-cursors.mochaDark;
+    size = 16;
   };
-
-  # home.pointerCursor = {
-  #   enable = true;
-  #   gtk.enable = true;
-  #   name = "Catppuccin-Mocha-Dark-Cursors";
-  #   package = pkgs.catppuccin-cursors.mochaDark;
-  #   size = 16;
-  # };
 }
diff --git a/modules/home/wallpaper.nix b/modules/home/wallpaper.nix
index affd902..aea3d37 100644
--- a/modules/home/wallpaper.nix
+++ b/modules/home/wallpaper.nix
@@ -18,7 +18,7 @@ in
         mode = "center";
       };
       any = {
-        path = "${wallpapers}/lanterns_of_twilight.png";
+        path = "${wallpapers}/sunset_bay.jpg";
       };
     };
   };
diff --git a/wallpapers/sunset_bay.jpg b/wallpapers/sunset_bay.jpg
new file mode 100755
index 0000000..2b19ebb
Binary files /dev/null and b/wallpapers/sunset_bay.jpg differ