diff --git a/system/defaults/boot.nix b/system/defaults/boot.nix
new file mode 100644
index 0000000..e27c61b
--- /dev/null
+++ b/system/defaults/boot.nix
@@ -0,0 +1,8 @@
+{config, pkgs, ...}:
+
+{
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+}
diff --git a/system/packages/sddm/andromeda.nix b/system/packages/sddm/andromeda.nix
deleted file mode 100644
index b1f1668..0000000
--- a/system/packages/sddm/andromeda.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchFromGithub, ...}:
-
-{
-  sddm-andromeda = stdenv.mkDerivation rec {
-    pname = "sddm-andromeda-theme";
-    dontBuild = true;
-    installPhase = ''
-      mkdir -p $out/share/sddm/themes
-      cp -aR $src $out/share/sddm/themes/andromeda
-    '';
-    src = fetchFromGithub {
-      owner = "EliverLara";
-      repo = "Andromeda-KDE";
-    };
-  };
-}
diff --git a/system/packages/sddm/sddm.nix b/system/packages/sddm/sddm.nix
index 21be7a7..dc99985 100644
--- a/system/packages/sddm/sddm.nix
+++ b/system/packages/sddm/sddm.nix
@@ -5,7 +5,4 @@
     enable = true;
     wayland.enable = true;
   };
-  environment.systemPackages = with pkgs; [
-    (callPackage ./andromeda.nix)
-  ];
 }
diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix
index c0b4108..57c4744 100644
--- a/system/yukigekko/configuration.nix
+++ b/system/yukigekko/configuration.nix
@@ -11,31 +11,18 @@
 
       #system configs
       ../defaults/locale.nix
+      ../defaults/boot.nix
 
       #system packages
       ../packages/sddm/sddm.nix
     ];
 
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-
   networking.hostName = "yukigekko"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
   networking.networkmanager.enable = true;
 
-  # Set your time zone.
   time.timeZone = "${timezone}";
 
-  
-  programs.river.enable = true;
+  # programs.river.enable = true;
   services.flatpak.enable = true;
   xdg.portal = {
     enable = true;