diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json
index 1b69a5f..7363190 100644
--- a/files/.config/configstore/update-notifier-npm.json
+++ b/files/.config/configstore/update-notifier-npm.json
@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1594332763844
+	"lastUpdateCheck": 1596100210650
 }
\ No newline at end of file
diff --git a/files/.config/htop/htoprc b/files/.config/htop/htoprc
index cf3b28b..fa514af 120000
--- a/files/.config/htop/htoprc
+++ b/files/.config/htop/htoprc
@@ -1 +1 @@
-/nix/store/dzc2rh4j312pnjqipsrgag71hm174vfn-home-manager-files/.config/htop/htoprc
\ No newline at end of file
+/nix/store/d1164dadvqwlkh5rs2glfaa1ajvm2c0w-home-manager-files/.config/htop/htoprc
\ No newline at end of file
diff --git a/files/.config/nitrogen/bg-saved.cfg b/files/.config/nitrogen/bg-saved.cfg
index 35b4180..88943f7 100644
--- a/files/.config/nitrogen/bg-saved.cfg
+++ b/files/.config/nitrogen/bg-saved.cfg
@@ -4,11 +4,11 @@ mode=5
 bgcolor=#000000
 
 [xin_0]
-file=/home/leon/Bilder/wallpapers/1583955891537.jpg
+file=/home/leon/Bilder/wallpapers/green_leaves.jpg
 mode=5
 bgcolor=#000000
 
 [xin_1]
-file=/home/leon/Bilder/wallpapers/1583955891537.jpg
+file=/home/leon/Bilder/wallpapers/green_leaves.jpg
 mode=5
 bgcolor=#000000
diff --git a/files/.config/nitrogen/nitrogen.cfg b/files/.config/nitrogen/nitrogen.cfg
index e95a450..162a84b 100644
--- a/files/.config/nitrogen/nitrogen.cfg
+++ b/files/.config/nitrogen/nitrogen.cfg
@@ -1,8 +1,8 @@
 [geometry]
-posx=20
-posy=50
-sizex=2518
-sizey=1008
+posx=30
+posy=1140
+sizex=1232
+sizey=1348
 
 [nitrogen]
 view=icon
diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs
index bf0740b..a104fe3 100644
--- a/files/.xmonad/lib/Config.hs
+++ b/files/.xmonad/lib/Config.hs
@@ -23,9 +23,9 @@ import qualified XMonad.Util.ExtensibleState as XS
 import qualified Rofi
 import qualified DescribedSubmap
 import qualified TiledDragging
-import qualified WindowSwallowing
+--import qualified WindowSwallowing
 
---import XMonad.Hooks.WindowSwallowing as WindowSwallowing
+import XMonad.Hooks.WindowSwallowing as WindowSwallowing
 
 
 import Data.Foldable                  ( for_ )
@@ -205,7 +205,7 @@ myLayout = avoidStruts
      ||| (rename "Horizon"  $               spacingAndGaps $ mouseResizableTileMirrored {draggerType = BordersDragger}))
 
     rename n = renamed [Replace n]
-    spacingAndGaps = let gap = 20
+    spacingAndGaps = let gap = 15 -- gap = 20
                          border = Border gap gap gap gap
                      in spacingRaw False border True border True
 
@@ -527,7 +527,7 @@ main = do
 
 
 mySwallowEventHook = WindowSwallowing.swallowEventHook
-  (className =? "Alacritty" <||> className =? "Termite" <||> className =? "Thunar")
+  (className =? "Alacritty" <||> className =? "Termite" <||> className =? "NOPE Thunar")
   (return True)
 
 
diff --git a/files/.xmonad/lib/WindowSwallowing.hs b/files/.xmonad/lib/WindowSwallowing.hs
index e1785f8..0509fca 100644
--- a/files/.xmonad/lib/WindowSwallowing.hs
+++ b/files/.xmonad/lib/WindowSwallowing.hs
@@ -117,7 +117,6 @@ swallowEventHook parentQueries childQueries event = do
       XS.modify . setStackBeforeWindowClosing . currentStack $ ws
       XS.modify . setFloatingBeforeWindowClosing . W.floating $ ws
 
-
     -- This is called right after any window closes.
     DestroyWindowEvent { ev_event = eventId, ev_window = childWindow } ->
       -- Because DestroyWindowEvent is emitted a lot more often then you think,
diff --git a/files/nix-stuff/nixpkgs/config/gtk.nix b/files/nix-stuff/nixpkgs/config/gtk.nix
new file mode 100644
index 0000000..1f56186
--- /dev/null
+++ b/files/nix-stuff/nixpkgs/config/gtk.nix
@@ -0,0 +1,113 @@
+{ myConf, pkgs ? import <nixpkgs> }:
+{
+  enable = true;
+  theme.name = "phocus";
+  iconTheme.package = pkgs.papirus-icon-theme;
+  iconTheme.name = "papirus";
+  font.name = "Terminus (TTF) 12";
+
+  gtk2.extraConfig = ''gtk-theme-name = "Adwaita-dark"'';
+
+  gtk3.extraConfig = {
+    gtk-menu-images = 1;
+    gtk-xft-hinting = 1;
+    gtk-xft-rgba = "rgb";
+    gtk-application-prefer-dark-theme = true;
+    gtk-decoration-layout = ":";
+    gtk-toolbar-style = "GTK_TOOLBAR_ICONS";
+    gtk-toolbar-icon-size = "GTK_ICON_SIZE_LARGE_TOOLBAR";
+    gtk-enable-even-sounds = 0;
+    gtk-enable-input-feedback-sounds = 0;
+    gtk-button-images = 1;
+    ctk-cursor-theme-name = "capitaine-cursors-light";
+    gtk-cursor-theme-size = 0;
+  };
+
+  gtk3.extraCss = ''
+    .termite {
+      padding: 15px;
+    }
+    vte-terminal {
+      padding: 10px;
+    }
+  '';
+  #@define-color theme_fg_color #eff0f1;
+  #@define-color theme_bg_color #31363b;
+  #@define-color theme_text_color #eff0f1;
+  #@define-color theme_base_color #232629;
+  #@define-color theme_view_hover_decoration_color #3daee9;
+  #@define-color theme_hovering_selected_bg_color #3daee9;
+  #@define-color theme_selected_bg_color #3daee9;
+  #@define-color theme_selected_fg_color #eff0f1;
+  #@define-color theme_view_active_decoration_color #3daee9;
+  #@define-color theme_button_background_normal #31363b;
+  #@define-color theme_button_decoration_hover #3daee9;
+  #@define-color theme_button_decoration_focus #3daee9;
+  #@define-color theme_button_foreground_normal #eff0f1;
+  #@define-color theme_button_foreground_active #eff0f1;
+  #@define-color borders #606468;
+  #@define-color warning_color #f67400;
+  #@define-color success_color #27ae60;
+  #@define-color error_color #da4453;
+  #@define-color theme_unfocused_fg_color #eff0f1;
+  #@define-color theme_unfocused_text_color #eff0f1;
+  #@define-color theme_unfocused_bg_color #31363b;
+  #@define-color theme_unfocused_base_color #232629;
+  #@define-color theme_unfocused_selected_bg_color_alt #224e65;
+  #@define-color theme_unfocused_selected_bg_color #224e65;
+  #@define-color theme_unfocused_selected_fg_color #eff0f1;
+  #@define-color theme_button_background_backdrop #31363b;
+  #@define-color theme_button_decoration_hover_backdrop #3daee9;
+  #@define-color theme_button_decoration_focus_backdrop #3daee9;
+  #@define-color theme_button_foreground_backdrop #eff0f1;
+  #@define-color theme_button_foreground_active_backdrop #eff0f1;
+  #@define-color unfocused_borders #606468;
+  #@define-color warning_color_backdrop #f67400;
+  #@define-color success_color_backdrop #27ae60;
+  #@define-color error_color_backdrop #da4453;
+  #@define-color insensitive_fg_color #6e7175;
+  #@define-color insensitive_base_fg_color #65686a;
+  #@define-color insensitive_bg_color #2e3338;
+  #@define-color insensitive_base_color #212427;
+  #@define-color insensitive_selected_bg_color #2e3338;
+  #@define-color insensitive_selected_fg_color #6e7175;
+  #@define-color theme_button_background_insensitive #2e3338;
+  #@define-color theme_button_decoration_hover_insensitive #325b72;
+  #@define-color theme_button_decoration_focus_insensitive #325b72;
+  #@define-color theme_button_foreground_insensitive #6e7175;
+  #@define-color theme_button_foreground_active_insensitive #6e7175;
+  #@define-color insensitive_borders #3e4347;
+  #@define-color warning_color_insensitive #683e19;
+  #@define-color success_color_insensitive #225139;
+  #@define-color error_color_insensitive #5e2e35;
+  #@define-color insensitive_unfocused_fg_color #6e7175;
+  #@define-color theme_unfocused_view_text_color #65686a;
+  #@define-color insensitive_unfocused_bg_color #2e3338;
+  #@define-color theme_unfocused_view_bg_color #212427;
+  #@define-color insensitive_unfocused_selected_bg_color #2e3338;
+  #@define-color insensitive_unfocused_selected_fg_color #6e7175;
+  #@define-color theme_button_background_backdrop_insensitive #2e3338;
+  #@define-color theme_button_decoration_hover_backdrop_insensitive #325b72;
+  #@define-color theme_button_decoration_focus_backdrop_insensitive #325b72;
+  #@define-color theme_button_foreground_backdrop_insensitive #6e7175;
+  #@define-color theme_button_foreground_active_backdrop_insensitive #6e7175;
+  #@define-color unfocused_insensitive_borders #3e4347;
+  #@define-color warning_color_insensitive_backdrop #683e19;
+  #@define-color success_color_insensitive_backdrop #225139;
+  #@define-color error_color_insensitive_backdrop #5e2e35;
+  #@define-color link_color #2980b9;
+  #@define-color link_visited_color #7f8c8d;
+  #@define-color tooltip_text #eff0f1;
+  #@define-color tooltip_background #31363b;
+  #@define-color tooltip_border #606468;
+  #@define-color content_view_bg #232629;
+  #@define-color theme_titlebar_background rgb(49,54,59);
+  #@define-color theme_titlebar_foreground rgb(239,240,241);
+  #@define-color theme_titlebar_background_light #31363b;
+  #@define-color theme_titlebar_foreground_backdrop rgb(127,140,141);
+  #@define-color theme_titlebar_background_backdrop rgb(49,54,59);
+  #@define-color theme_titlebar_foreground_insensitive rgb(127,140,141);
+  #@define-color theme_titlebar_foreground_insensitive_backdrop rgb(127,140,141);
+  #'';
+
+}
diff --git a/files/nix-stuff/nixpkgs/config/zsh.nix b/files/nix-stuff/nixpkgs/config/zsh.nix
index 3001db6..6bef089 100644
--- a/files/nix-stuff/nixpkgs/config/zsh.nix
+++ b/files/nix-stuff/nixpkgs/config/zsh.nix
@@ -12,6 +12,7 @@ let
     gaa = "git add --all";
     gs = "git status";
     cxmonad = "cd ~/.xmonad && nvim ~/.xmonad/lib/Config.hs && cd -";
+    cnix = "cd ~/nixpkgs/ && nvim && cd -";
   };
 
   manFunction = ''
@@ -157,12 +158,6 @@ in
     ${builtins.readFile ./prompt.zsh}
   '';
 
-  envExtra = ''
-    export GITHUB_TOKEN="fc40b6cb38dd8eb54f90e3e652f14d758f21e24d"
-
-  '';
-
-
   plugins = let
     sources = import ./zsh/nix/sources.nix;
   in
diff --git a/files/nix-stuff/nixpkgs/home.nix b/files/nix-stuff/nixpkgs/home.nix
index 9a7ab71..89a634e 100644
--- a/files/nix-stuff/nixpkgs/home.nix
+++ b/files/nix-stuff/nixpkgs/home.nix
@@ -12,6 +12,8 @@ let
   myConf = import ./myConfig.nix;
 in
 {
+  nixpkgs.config.allowUnfree = true;
+
   nixpkgs.config.packageOverrides = pkgs: {
     nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
       inherit pkgs;
@@ -25,6 +27,7 @@ in
   };
 
 
+
   home.packages = with pkgs; [
     elkowar_local.bashtop
     direnv
@@ -39,8 +42,15 @@ in
     gromit-mpx
     zsh-completions
     cool-retro-term
+    ghc
+
+    mdcat
+    github-cli
+    tdesktop
+    #hyper-haskell
   ];
 
+  gtk = import ./config/gtk.nix { inherit pkgs; inherit myConf; };
 
   programs = {
     home-manager.enable = true;
@@ -49,24 +59,7 @@ in
     tmux = import ./config/tmux.nix { inherit pkgs; inherit myConf; };
     feh = import ./config/feh.nix;
 
-    htop = {
-      enable = true;
-    };
-
-    broot = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    lf = {
-      enable = true;
-
-    };
-
-    #lsd = {
-    #enable = true;
-    #enableAliases = true;
-    #};
+    htop.enable = true;
 
     mpv = {
       enable = true;
@@ -97,6 +90,14 @@ in
     };
   };
 
+  services = {
+    mpd = {
+      enable = true;
+      musicDirectory = "/home/leon/Downloads/music";
+    };
+    udiskie.enable = true;
+  };
+
   home.username = "leon";
   home.homeDirectory = "/home/leon";