diff --git a/hosts/darwin/home/users/alistreaza.nix b/hosts/darwin/home/users/alistreaza.nix
index 33c04e9..0bd2ddd 100644
--- a/hosts/darwin/home/users/alistreaza.nix
+++ b/hosts/darwin/home/users/alistreaza.nix
@@ -1,4 +1,4 @@
-{ pkgs, import-tree, ... }:
+{ import-tree, ... }:
 {
   home-manager.users.alistreaza = {
 
@@ -31,7 +31,7 @@
     home.env.rust.enable = true;
     home.env.python.enable = true;
 
-    home.packages = with pkgs; [];
+    home.packages = [ ];
 
     # No Home Application Folders
     targets.darwin.linkApps.enable = false;
diff --git a/hosts/nixos/system/os.nix b/hosts/nixos/system/os.nix
index 0b9b681..f07f9d5 100755
--- a/hosts/nixos/system/os.nix
+++ b/hosts/nixos/system/os.nix
@@ -2,7 +2,7 @@
 
 {
   # System services
-  os.boot.systemd.enable = true;
+  os.boot.limine.enable = true;
   os.boot.plymouth.enable = true;
   os.graphics.nvidia.enable = true;
   os.audio.pipewire.enable = true;
@@ -25,7 +25,7 @@
   os.virtualisation.podman.enable = true;
 
   # Shells configurations
-  os.shells.kde.enable = true;
+  os.shells.gnome.enable = true;
 
   # Terminal
   programs.ssh.enableAskPassword = false; # No-window git push fix
diff --git a/modules/system/nixos/boot/limine.nix b/modules/system/nixos/boot/limine.nix
new file mode 100644
index 0000000..00f5b2c
--- /dev/null
+++ b/modules/system/nixos/boot/limine.nix
@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+with lib;
+let
+  cfg = config.os.boot.limine;
+in
+{
+  options.os.boot.limine = {
+    enable = mkEnableOption "Boot Limine service";
+  };
+  config = mkIf cfg.enable {
+
+    boot.loader.limine.enable = true;
+
+  };
+}
diff --git a/modules/system/nixos/shells/gnome.nix b/modules/system/nixos/shells/gnome.nix
index b8a2604..12b2a6a 100644
--- a/modules/system/nixos/shells/gnome.nix
+++ b/modules/system/nixos/shells/gnome.nix
@@ -36,7 +36,6 @@ in
         ++ [
           loupe
           papers
-          refine
           simple-scan
         ];
     };
diff --git a/modules/system/nixos/shells/kde.nix b/modules/system/nixos/shells/kde.nix
deleted file mode 100644
index de5cb26..0000000
--- a/modules/system/nixos/shells/kde.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib;
-let
-  cfg = config.os.shells.kde;
-in
-{
-  options.os.shells.kde = {
-    enable = mkEnableOption "System gnome shell service";
-  };
-  config = mkIf cfg.enable {
-
-    services.displayManager.plasma-login-manager.enable = true;
-    services.desktopManager.plasma6.enable = true;
-
-    environment = {
-
-      plasma6.excludePackages = with pkgs; [
-        aurorae
-        plasma-browser-integration
-        kwin-x11
-        (lib.getBin qttools) # Expose qdbus in PATH
-        elisa
-        gwenview
-        ktexteditor # provides elevated actions for kate
-        khelpcenter
-        baloo-widgets # baloo information in Dolphin
-        spectacle
-        krdp
-      ];
-    };
-
-  };
-}