diff --git a/flake.nix b/flake.nix
index 96ebf45..7e75fa8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -74,10 +74,12 @@
         inherit system;
         modules = [
           ./system/configuration.nix
-          # stylix.nixosModules.stylix # complains that home-manager is not defined
+          ./system/style/stylix.nix
+          stylix.nixosModules.stylix
         ];
         specialArgs = {
           myTheme = theme;
+          myThemePolarity = themePolarity;
           myBackgroundUrl = backgroundUrl;
           myBackgroundSha256 = backgroundSha256;
         };
diff --git a/system/configuration.nix b/system/configuration.nix
index 8714c88..13009a8 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -110,12 +110,6 @@
     displayManager = {
       lightdm.enable = true;
       defaultSession = "none+xmonad";
-      lightdm.greeters.slick.enable = true;
-      lightdm.background = pkgs.fetchurl {
-        url = myBackgroundUrl;
-        sha256 = myBackgroundSha256;
-      };
-      lightdm.greeters.slick.theme.name = "Adwaita-dark";
     };
     libinput = {
       touchpad.disableWhileTyping = true;
diff --git a/system/style/stylix.nix b/system/style/stylix.nix
index 3f62628..8ab8982 100644
--- a/system/style/stylix.nix
+++ b/system/style/stylix.nix
@@ -1,33 +1,43 @@
-{ config, pkgs, ... }:
+{ config, pkgs, myTheme, myThemePolarity, myBackgroundUrl, myBackgroundSha256, ... }:
+
 let
   myFont = "Inconsolata";
   myFontPkg = pkgs.inconsolata;
+  myThemePath = "../../../themes/"+myTheme+"/"+myTheme+".yaml";
+  myLightDMTheme = if myThemePolarity == "light" then "Adwaita" else "Adwaita-dark";
 in
 {
-  #stylix.autoEnable = false;
-  #stylix.polarity = "dark";
-  # stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-dark-night.yaml";
-  #stylix.fonts = {
-  #  monospace = {
-  #    name = myFont;
-  #    package = myFontPkg;
-  #  };
-  #  serif = {
-  #    name = myFont;
-  #    package = myFontPkg;
-  #  };
-  #  sansSerif = {
-  #    name = myFont;
-  #    package = myFontPkg;
-  #  };
-  #  emoji = {
-  #    name = "Noto Color Emoji";
-  #    package = pkgs.noto-fonts-emoji-blob-bin;
-  #  };
-  #};
-#
- # stylix.targets.grub.enable = true;
- # stylix.targets.lightdm.enable = true;
- # stylix.targets.console.enable = true;
+  stylix.autoEnable = false;
+  stylix.polarity = myThemePolarity;
+  stylix.image = pkgs.fetchurl {
+    url = myBackgroundUrl;
+    sha256 = myBackgroundSha256;
+  };
+  stylix.base16Scheme = ./. + myThemePath;
+  stylix.fonts = {
+    monospace = {
+      name = myFont;
+      package = myFontPkg;
+    };
+    serif = {
+      name = myFont;
+      package = myFontPkg;
+    };
+    sansSerif = {
+      name = myFont;
+      package = myFontPkg;
+    };
+    emoji = {
+      name = "Noto Color Emoji";
+      package = pkgs.noto-fonts-emoji-blob-bin;
+    };
+  };
+
+  stylix.targets.lightdm.enable = true;
+  services.xserver.displayManager.lightdm = {
+      greeters.slick.enable = true;
+      greeters.slick.theme.name = myLightDMTheme;
+  };
+  stylix.targets.console.enable = true;
 
 }