diff --git a/home/default.nix b/home/default.nix
index a8f09a2a..4cf0ab45 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -5,6 +5,7 @@
     mako.enable = true;
     rofi.enable = true;
     xresources.enable = true;
+    zathura.enable = true;
     zellij.enable = true;
   };
   xdg.configFile = {
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index f217293b..ad9b4776 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }: {
-  imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ];
+  imports = [ ./waybar/default.nix ];
   services = {
     avizo.enable = true;
     syncthing.enable = true;
@@ -9,6 +9,19 @@
       automount = true;
       tray = "never";
     };
+    mako = {
+      enable = true;
+      actions = true;
+      anchor = "top-right";
+      defaultTimeout = 5000;
+      icons = true;
+      iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
+      layer = "overlay";
+      margin = "20";
+      padding = "10";
+      sort = "-time";
+      borderRadius = 10;
+    };
   };
   wayland.windowManager.hyprland = {
     enable = true;
@@ -16,14 +29,92 @@
     systemd.enable = true;
     extraConfig = import ./config.nix { inherit config pkgs; };
   };
+  programs = {
+    zathura.enable = true;
+    rofi = {
+      enable = true;
+      package = pkgs.rofi-wayland;
+      location = "center";
+      terminal = "${pkgs.alacritty}/bin/alacritty";
+      pass = {
+        enable = true;
+        package = pkgs.rofi-pass-wayland;
+        extraConfig = ''
+          USERNAME_field='login'
+        '';
+      };
+      plugins = with pkgs; [ rofi-calc ];
+      extraConfig = let
+        power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
+      in {
+        modi = "window,run,drun,ssh,calc,${power-menu},combi";
+        combi-modi = "window,drun,ssh,calc";
+        sidebar-mode = true;
+        sort = true;
+        sorting-method = "fzf";
+        matching = "fuzzy";
+        icon-theme = config.gtk.iconTheme.name;
+        show-icons = true;
+        application-fallback-icon = "󰋙";
+        drun-display-format = "{icon} {name} ({categories})";
+        disable-history = false;
+        hide-scrollbar = true;
+        display-window = " 󰧨  Move ";
+        display-run = " 󰅴  Run ";
+        display-drun = " 󱓞  Launch ";
+        display-ssh = " 󰢹  SSH ";
+        display-calc = " 󰪚  Calculator ";
+        display-combi = " 󰛡  Combi ";
+      };
+    };
+  };
+  gtk = {
+    enable = true;
+    cursorTheme = {
+      package = pkgs.catppuccin-cursors.mochaDark;
+      name = "Catppuccin-Mocha-Dark-Cursors";
+      size = 24;
+    };
+    iconTheme = {
+      package = pkgs.papirus-icon-theme;
+      name = "Papirus-Dark";
+    };
+    theme = {
+      package = pkgs.catppuccin-gtk.override {
+        accents = [ "lavender" ];
+        size = "standard";
+        variant = "mocha";
+      };
+      name = "Catppuccin-Mocha-Standard-Lavender-Dark";
+    };
+  };
   xdg = {
     configFile = {
-      "hypr/mocha.conf".source = ./mocha.conf;
+      "hypr/extra.conf" = lib.mkDefault { text = ""; };
       "hypr/hyprpaper.conf".text = ''
         preload = ${config.stylix.image}
         wallpaper = ,${config.stylix.image}
       '';
-      "hypr/extra.conf" = lib.mkDefault { text = ""; };
+      "gtklock/config.ini".text = let
+        powerbar =
+          "${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so";
+        playerctl =
+          "${pkgs.gtklock-playerctl-module}/lib/gtklock/playerctl-module.so";
+      in ''
+        [main]
+        start-hidden=true
+        modules=${powerbar};${playerctl}
+
+        [powerbar]
+        reboot-command=systemctl reboot
+        poweroff-command=systemctl -i poweroff
+        suspend-command=systemctl suspend
+        logout-command=hyprctl dispatch exit
+
+        [playerctl]
+        art-size=64
+        position=below-clock
+      '';
     };
     mimeApps = rec {
       enable = true;
diff --git a/home/hyprland/gtk.nix b/home/hyprland/gtk.nix
deleted file mode 100644
index 02654ff6..00000000
--- a/home/hyprland/gtk.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ pkgs, ... }: {
-  gtk = {
-    enable = true;
-    cursorTheme = {
-      package = pkgs.catppuccin-cursors.mochaDark;
-      name = "Catppuccin-Mocha-Dark-Cursors";
-      size = 24;
-    };
-    iconTheme = {
-      package = pkgs.papirus-icon-theme;
-      name = "Papirus-Dark";
-    };
-    theme = {
-      package = pkgs.catppuccin-gtk.override {
-        accents = [ "lavender" ];
-        size = "standard";
-        variant = "mocha";
-      };
-      name = "Catppuccin-Mocha-Standard-Lavender-Dark";
-    };
-  };
-  xdg.configFile."gtklock/config.ini".text = let
-    powerbar = "${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so";
-    playerctl =
-      "${pkgs.gtklock-playerctl-module}/lib/gtklock/playerctl-module.so";
-  in ''
-    [main]
-    start-hidden=true
-    modules=${powerbar};${playerctl}
-
-    [powerbar]
-    reboot-command=systemctl reboot
-    poweroff-command=systemctl -i poweroff
-    suspend-command=systemctl suspend
-    logout-command=hyprctl dispatch exit
-
-    [playerctl]
-    art-size=64
-    position=below-clock
-  '';
-}
diff --git a/home/hyprland/mako.nix b/home/hyprland/mako.nix
deleted file mode 100644
index 29fcdace..00000000
--- a/home/hyprland/mako.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, ... }: {
-  services.mako = {
-    enable = true;
-    actions = true;
-    anchor = "top-right";
-    defaultTimeout = 5000;
-    icons = true;
-    iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
-    layer = "overlay";
-    margin = "20";
-    padding = "10";
-    sort = "-time";
-    borderRadius = 10;
-  };
-}
diff --git a/home/hyprland/mocha.conf b/home/hyprland/mocha.conf
deleted file mode 100644
index 8e144f3f..00000000
--- a/home/hyprland/mocha.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-$rosewaterAlpha = f5e0dc
-$flamingoAlpha  = f2cdcd
-$pinkAlpha      = f5c2e7
-$mauveAlpha     = cba6f7
-$redAlpha       = f38ba8
-$maroonAlpha    = eba0ac
-$peachAlpha     = fab387
-$yellowAlpha    = f9e2af
-$greenAlpha     = a6e3a1
-$tealAlpha      = 94e2d5
-$skyAlpha       = 89dceb
-$sapphireAlpha  = 74c7ec
-$blueAlpha      = 89b4fa
-$lavenderAlpha  = b4befe
-
-$textAlpha      = cdd6f4
-$subtext1Alpha  = bac2de
-$subtext0Alpha  = a6adc8
-
-$overlay2Alpha  = 9399b2
-$overlay1Alpha  = 7f849c
-$overlay0Alpha  = 6c7086
-
-$surface2Alpha  = 585b70
-$surface1Alpha  = 45475a
-$surface0Alpha  = 313244
-
-$baseAlpha      = 1e1e2e
-$mantleAlpha    = 181825
-$crustAlpha     = 11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b
\ No newline at end of file
diff --git a/home/hyprland/rofi/catppuccin-mocha.rasi b/home/hyprland/rofi/catppuccin-mocha.rasi
deleted file mode 100644
index bc56caae..00000000
--- a/home/hyprland/rofi/catppuccin-mocha.rasi
+++ /dev/null
@@ -1,111 +0,0 @@
-* {
-    bg-col: #1e1e2e;
-    bg-col-light: #1e1e2e;
-    border-col: #b4befe;
-    selected-col: #1e1e2e;
-    blue: #89b4fa;
-    fg-col: #cdd6f4;
-    fg-col2: #f38ba8;
-    grey: #6c7086;
-
-    width: 600;
-    font: "Noto Sans 14";
-}
-
-element-text, element-icon , mode-switcher {
-    background-color: inherit;
-    text-color:       inherit;
-}
-
-window {
-    height: 360px;
-    border: 3px;
-    border-color: @border-col;
-    background-color: @bg-col;
-}
-
-mainbox {
-    background-color: @bg-col;
-}
-
-inputbar {
-    children: [prompt,entry];
-    background-color: @bg-col;
-    border-radius: 5px;
-    padding: 2px;
-}
-
-prompt {
-    background-color: @blue;
-    padding: 6px;
-    text-color: @bg-col;
-    border-radius: 3px;
-    margin: 20px 0px 0px 20px;
-}
-
-textbox-prompt-colon {
-    expand: false;
-    str: ":";
-}
-
-entry {
-    padding: 6px;
-    margin: 20px 0px 0px 10px;
-    text-color: @fg-col;
-    background-color: @bg-col;
-}
-
-listview {
-    border: 0px 0px 0px;
-    padding: 6px 0px 0px;
-    margin: 10px 0px 0px 20px;
-    columns: 2;
-    lines: 5;
-    background-color: @bg-col;
-}
-
-element {
-    padding: 5px;
-    background-color: @bg-col;
-    text-color: @fg-col  ;
-}
-
-element-icon {
-    size: 25px;
-}
-
-element selected {
-    background-color:  @selected-col ;
-    text-color: @fg-col2  ;
-}
-
-mode-switcher {
-    spacing: 0;
-  }
-
-button {
-    padding: 10px;
-    background-color: @bg-col-light;
-    text-color: @grey;
-    vertical-align: 0.5; 
-    horizontal-align: 0.5;
-}
-
-button selected {
-  background-color: @bg-col;
-  text-color: @blue;
-}
-
-message {
-    background-color: @bg-col-light;
-    margin: 2px;
-    padding: 2px;
-    border-radius: 5px;
-}
-
-textbox {
-    padding: 6px;
-    margin: 20px 0px 0px 20px;
-    text-color: @blue;
-    background-color: @bg-col-light;
-}
\ No newline at end of file
diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix
deleted file mode 100644
index e93c1b09..00000000
--- a/home/hyprland/rofi/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ pkgs, config, ... }:
-let
-  icon-theme = config.gtk.iconTheme.name;
-  power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
-in {
-  programs.rofi = {
-    enable = true;
-    package = pkgs.rofi-wayland;
-    location = "center";
-    terminal = "${pkgs.alacritty}/bin/alacritty";
-    pass = {
-      enable = true;
-      package = pkgs.rofi-pass-wayland;
-      extraConfig = ''
-        USERNAME_field='login'
-      '';
-    };
-    plugins = with pkgs; [ rofi-calc ];
-    extraConfig = {
-      modi = "window,run,drun,ssh,calc,${power-menu},combi";
-      combi-modi = "window,drun,ssh,calc";
-      sidebar-mode = true;
-      sort = true;
-      sorting-method = "fzf";
-      matching = "fuzzy";
-      icon-theme = icon-theme;
-      show-icons = true;
-      application-fallback-icon = "󰋙";
-      drun-display-format = "{icon} {name} ({categories})";
-      disable-history = false;
-      hide-scrollbar = true;
-      display-window = " 󰧨  Move ";
-      display-run = " 󰅴  Run ";
-      display-drun = " 󱓞  Launch ";
-      display-ssh = " 󰢹  SSH ";
-      display-calc = " 󰪚  Calculator ";
-      display-combi = " 󰛡  Combi ";
-    };
-  };
-}
diff --git a/home/hyprland/rofi/theme.rasi b/home/hyprland/rofi/theme.rasi
deleted file mode 100644
index 5b8d8309..00000000
--- a/home/hyprland/rofi/theme.rasi
+++ /dev/null
@@ -1,103 +0,0 @@
-* {
-    width: 75%;
-    font: "Noto Sans 14";
-}
-
-element-text, element-icon , mode-switcher {
-    background-color: inherit;
-    text-color:       inherit;
-}
-
-window {
-    height: 75%;
-    border: 1px;
-    border-radius: 10px;
-    border-color: #bb9af7;
-    background-color: #1a1b26;
-}
-
-mainbox {
-    background-color: #1a1b26;
-}
-
-inputbar {
-    children: [prompt,entry];
-    background-color: #1a1b26;
-    border-radius: 5px;
-    padding: 2px;
-}
-
-prompt {
-    background-color: #c0caf5;
-    padding: 6px;
-    text-color: #1a1b26;
-    border-radius: 3px;
-    margin: 20px 0px 0px 20px;
-}
-
-textbox-prompt-colon {
-    expand: false;
-    str: ":";
-}
-
-entry {
-    padding: 6px;
-    margin: 20px 0px 0px 10px;
-    text-color: #c0caf5;
-    background-color: #1a1b26;
-}
-
-listview {
-    border: 0px 0px 0px;
-    padding: 6px 0px 0px;
-    margin: 10px 0px 0px 20px;
-    columns: 2;
-    lines: 5;
-    background-color: #1a1b26;
-}
-
-element {
-    padding: 5px;
-    background-color: #1a1b26;
-    text-color: #c0caf5;
-}
-
-element-icon {
-    size: 25px;
-}
-
-element selected {
-    background-color:  #414868;
-    text-color: #bb9af7;
-}
-
-mode-switcher {
-    spacing: 5%;
-  }
-
-button {
-    padding: 10px;
-    background-color: #1a1b26;
-    text-color: #a9b1d6;
-    vertical-align: 0.5; 
-    horizontal-align: 0.5;
-}
-
-button selected {
-  background-color: #1a1b26;
-  text-color: #7aa2f7;
-}
-
-message {
-    background-color: #1a1b26;
-    margin: 2px;
-    padding: 2px;
-    border-radius: 5px;
-}
-
-textbox {
-    padding: 6px;
-    margin: 20px 0px 0px 20px;
-    text-color: #7aa2f7;
-    background-color: #1a1b26;
-}