diff --git a/home-manager/features/desktop/common/default.nix b/home-manager/features/desktop/common/default.nix
index 3c7e7e7..9a9e70b 100644
--- a/home-manager/features/desktop/common/default.nix
+++ b/home-manager/features/desktop/common/default.nix
@@ -3,13 +3,13 @@
     
   ];
   
-  dconf.settings."org/gnome/desktop/interface".color-scheme = 
-    if config.colorscheme.variant == "dark"
-    then "prefer-dark"
-    else if config.colorscheme.variant == "light"
-    then "prefer-light"
-    else "default";
+  # dconf.settings."org/gnome/desktop/interface".color-scheme = 
+  #   if config.colorscheme.variant == "dark"
+  #   then "prefer-dark"
+  #   else if config.colorscheme.variant == "light"
+  #   then "prefer-light"
+  #   else "default";
 
-  xdg.portal.enable = true;
+  # xdg.portal.enable = true;
 
 }
diff --git a/home-manager/features/desktop/common/wayland-wm/default.nix b/home-manager/features/desktop/common/wayland-wm/default.nix
index 4750e67..c6e2c10 100644
--- a/home-manager/features/desktop/common/wayland-wm/default.nix
+++ b/home-manager/features/desktop/common/wayland-wm/default.nix
@@ -7,14 +7,14 @@
     gtk3
     imv
     mimeo
-    primary-xwayland
+    # primary-xwayland
     pulseaudio
     slurp
     waypipe
     wf-recorder
     wl-clipboard
     wl-mirror
-    wl-mirror-pick
+    # wl-mirror-pick
     xdg-utils
     ydotool
   ];
@@ -25,5 +25,5 @@
     LIBSEAT_BACKEND = "logind";
   };
 
-  xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-wlr];
+  # xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-wlr];
 }
diff --git a/home-manager/features/desktop/hyprland/default.nix b/home-manager/features/desktop/hyprland/default.nix
index 10efc9f..869e4ec 100644
--- a/home-manager/features/desktop/hyprland/default.nix
+++ b/home-manager/features/desktop/hyprland/default.nix
@@ -4,37 +4,40 @@
   pkgs,
   ...
 }: let
-  hyprland = pkgs.inputs.hyprland.hyprland.override {wrapRuntimeDeps = false;};
-  xdhp = pkgs.inputs.hyprland.xdg-desktop-portal-hyprland.override {inherit hyprland;};
+  # hyprland = pkgs.inputs.hyprland.hyprland.override {wrapRuntimeDeps = false;};
+  # xdhp = pkgs.inputs.hyprland.xdg-desktop-portal-hyprland.override {inherit hyprland;};
 in {
   imports = [
     ../common 
     ../common/wayland-wm
   ];
 
-  xdg.portal = {
-    extraPortals = [xdhp];
-    configPackages = [hyprland];
-  };
+  # xdg.portal = {
+  #   extraPortals = [xdhp];
+  #   configPackages = [hyprland];
+  # };
 
   home.packages = with pkgs; [
-    inputs.hyprwm-contrib.grimblast
-    hyprslurp
+    # inputs.hyprwm-contrib.grimblast
+    # hyprslurp
     hyprpicker
+    hyprpaper
+    waybar
+    xdg-desktop-portal-hyprland
   ];
 
-  wayland.windowManger.hyprland = {
-    enable = true;
-    package = hyprland;
-    systemd = {
-      enable = true;
-      # Same as default but stop graphical-session too
-      extraCommands = lib.mkBefore [
-        "systemctl --user stop graphical-session.target"
-        "systemctl --user start hyprland-session.target"
-      ];
-    };
-
-#TODO: Add hyprland config
-  };
+#   wayland.windowManger.hyprland = {
+#     enable = true;
+#     # package = hyprland;
+#     systemd = {
+#       enable = true;
+#       # Same as default but stop graphical-session too
+#       extraCommands = lib.mkBefore [
+#         "systemctl --user stop graphical-session.target"
+#         "systemctl --user start hyprland-session.target"
+#       ];
+#     };
+#
+# #TODO: Add hyprland config
+#   };
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 8f26695..ddf8d70 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -19,6 +19,7 @@
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
     ./features/cli 
+    ./features/desktop/hyprland
     ./features/kitty.nix
     ./features/neovim.nix
   ];
diff --git a/overlays/default.nix b/overlays/default.nix
index af62d95..7c608cf 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -12,6 +12,23 @@
     # });
   };
 
+  # For every flake input, aliases 'pkgs.inputs.${flake}' to
+  # 'inputs.${flake}.packages.${pkgs.system}' or
+  # 'inputs.${flake}.legacyPackages.${pkgs.system}'
+  flake-inputs = final: _: {
+    inputs =
+      builtins.mapAttrs (
+        _: flake: let
+          legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
+          packages = (flake.packages or {}).${final.system} or {};
+        in
+          if legacyPackages != {}
+          then legacyPackages
+          else packages
+      )
+      inputs;
+  };
+
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.unstable'
   unstable-packages = final: _prev: {