diff --git a/home.nix b/home.nix
index 2a6f1c2..0384e96 100644
--- a/home.nix
+++ b/home.nix
@@ -71,8 +71,11 @@ in {
       tuxpaint
       krita    
 
-      # tools
+      # terminal
       kitty
+      kitty-themes
+
+      # tools
       rofi 
       git
       eza
@@ -96,6 +99,9 @@ in {
       prismlauncher
       steam     
 
+      # development
+      neovide
+
       # custom
     ])
 
@@ -125,6 +131,18 @@ in {
      EDITOR = "nvim";
   };
 
+  programs.kitty = {
+    enable = true;
+    font = {
+      name = "FiraCode Nerd Font";
+      size = 12;
+    };
+
+    theme = "Gruvbox Dark";
+    #Also available: Catppuccin-Frappe Catppuccin-Latte Catppuccin-Macchiato Catppuccin-Mocha
+    # See all available kitty themes at: https://github.com/kovidgoyal/kitty-themes/blob/46d9dfe230f315a6a0c62f4687f6b3da20fd05e4/themes.json
+  };
+
   programs.neovim = {
     enable = true;
     package = pkgs-unstable.neovim-unwrapped;
diff --git a/zion/configuration.nix b/zion/configuration.nix
index ffe1b87..a3bdaa3 100644
--- a/zion/configuration.nix
+++ b/zion/configuration.nix
@@ -42,12 +42,23 @@
     LC_TIME = "pl_PL.UTF-8";
   };
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  services.xserver = {
+    enable = true;
+    layout = "pl";
+    xkbVariant = "";
 
-  # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+    displayManager = {
+      lightdm = {
+        enable = true;
+      };
+    };
+
+    desktopManager = {
+      xfce = {
+        enable = true;
+      };
+    };
+  };
   
   # Enable OpenGL
   hardware.opengl = {
@@ -96,12 +107,6 @@
   users.defaultUserShell = pkgs.zsh;
   programs.zsh.enable = true;
 
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "pl";
-    xkbVariant = "";
-  };
-
   # Configure console keymap
   console.keyMap = "pl2";
 
@@ -147,7 +152,6 @@
       zsh
       pavucontrol
       htop
-      nerdfonts
       ntfs3g
       dosfstools
       woeusb
@@ -171,6 +175,8 @@
       gtest
     ]);
 
+  fonts.packages = with pkgs; [ nerdfonts ];
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
    programs.mtr.enable = true;