diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix
index ab76ceb0..f518be4d 100644
--- a/home/alacritty/default.nix
+++ b/home/alacritty/default.nix
@@ -7,12 +7,6 @@
     settings = {
       import = [ "${tokyonight}/extras/alacritty/tokyonight_night.yml" ];
       window = {
-        padding = {
-          x = 10;
-          y = 10;
-        };
-        decorations = "none";
-        opacity = 0.8;
         dynamic_title = true;
         decorations_theme_variant = "Dark";
       };
diff --git a/home/alacritty/macos.nix b/home/alacritty/macos.nix
new file mode 100644
index 00000000..fa8eebe7
--- /dev/null
+++ b/home/alacritty/macos.nix
@@ -0,0 +1,13 @@
+{ ... }:
+
+{
+  imports = [ ./default.nix ];
+  programs.alacritty.settings.window = {
+    dimensions = {
+      columns = 80;
+      lines = 24;
+    };
+    decorations = "full";
+    opacity = 1.0;
+  };
+}
diff --git a/home/alacritty/tiling.nix b/home/alacritty/tiling.nix
new file mode 100644
index 00000000..51a1dbe3
--- /dev/null
+++ b/home/alacritty/tiling.nix
@@ -0,0 +1,13 @@
+{ ... }:
+
+{
+  imports = [ ./default.nix ];
+  programs.alacritty.settings.window = {
+    padding = {
+      x = 10;
+      y = 10;
+    };
+    decorations = "none";
+    opacity = 0.8;
+  };
+}
diff --git a/home/default.nix b/home/default.nix
index 5fd2cc52..22570b23 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,21 +1,15 @@
-{ pkgs, wallpapers, ... }:
+{ pkgs, ... }:
 
 {
   imports = [
-    ./git
-    ./ssh
-    ./tui
-    ./hyprland
-    ./alacritty
-    ./firefox
-    ./zathura
+    ./git/default.nix
+    ./ssh/default.nix
+    ./tui/default.nix
+    ./hyprland/default.nix
+    ./firefox/default.nix
+    ./zathura/default.nix
     ./emacs/server.nix
   ];
-  home.packages = with pkgs; [
-    bitwarden
-    signal-desktop
-    libreoffice
-    zotero
-  ];
+  home.packages = with pkgs; [ bitwarden signal-desktop libreoffice zotero ];
   programs.home-manager.enable = true;
 }
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 713bc84e..dea74635 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -21,9 +21,10 @@ let
 in {
   imports = [
     hyprland.homeManagerModules.default
-    ./waybar
-    ./rofi
-    ./anyrun
+    ../alacritty/tiling.nix
+    ./waybar/default.nix
+    ./rofi/default.nix
+    ./anyrun/default.nix
     ./swaylock.nix
     ./gtk.nix
     ./mako.nix
@@ -31,7 +32,10 @@ in {
   home.packages = with pkgs; [ libsForQt5.polkit-kde-agent configure-gtk ];
   programs = {
     firefox.package = pkgs.firefox-wayland;
-    rofi.package = pkgs.rofi-wayland;
+    rofi = {
+      package = pkgs.rofi-wayland;
+      terminal = "${pkgs.alacritty}/bin/alacritty";
+    };
   };
   services.kanshi = {
     enable = true;
diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix
index 3e8a9367..c2009f6b 100644
--- a/home/hyprland/rofi/default.nix
+++ b/home/hyprland/rofi/default.nix
@@ -1,13 +1,11 @@
 { pkgs, config, ... }:
 let icon-theme = config.gtk.iconTheme.name;
 in {
-  imports = [ ../gtk.nix ];
   home.packages = with pkgs; [ rofi-power-menu ];
   programs.rofi = {
     enable = true;
     location = "center";
     pass.enable = true;
-    terminal = "${pkgs.alacritty}/bin/alacritty";
     extraConfig = {
       modi =
         "run,drun,ssh,power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
diff --git a/hosts/Monarch/home.nix b/hosts/Monarch/home.nix
index 6008ac8c..744f6b4a 100644
--- a/hosts/Monarch/home.nix
+++ b/hosts/Monarch/home.nix
@@ -5,11 +5,11 @@ let
 in {
   imports = [
     ../../home/shell/zsh.nix
-    ../../home/git
-    ../../home/ssh
-    ../../home/tui
-    ../../home/alacritty
-    ../../home/emacs
+    ../../home/git/default.nix
+    ../../home/ssh/default.nix
+    ../../home/tui/default.nix
+    ../../home/alacritty/macos.nix
+    ../../home/emacs/default.nix
   ];
   home = {
     inherit username homeDirectory;