diff --git a/configuration.nix b/configuration.nix
index 92a414d..29c6645 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -35,6 +35,7 @@
     gc = {
       automatic = true;
       options = "--delete-older-than 14d";
+      dates = "14:30";
     };
     extraOptions = ''
       keep-outputs = true
@@ -49,7 +50,10 @@
   services.journald.extraConfig = "SystemMaxFiles=7";
 
   # Allow propietary software
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config = {
+    allowUnfree = true;
+    pulseaudio = true;
+  };
 
   # Scrub zpool monthly
   services.zfs.autoScrub = {
@@ -75,7 +79,7 @@
     shell = pkgs.fish;
   };
 
-  # Set fish shell for root user
+  # Set shell and SSH for root user
   users.users.root = {
     shell = pkgs.fish;
     openssh.authorizedKeys.keys = [
@@ -83,14 +87,6 @@
     ];
   };
 
-  # Enable localhost SSH
-  services.openssh = {
-    enable = true;
-    permitRootLogin = "yes";
-    passwordAuthentication = false;
-    openFirewall = false;
-  };
-
   # Import other configuration modules
   imports = [
     ./modules/software.nix
diff --git a/modules/audio.nix b/modules/audio.nix
index 1495728..435f095 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -19,16 +19,8 @@
     extensionPackages =
       [ pkgs.mopidy-mpd pkgs.mopidy-soundcloud pkgs.mopidy-youtube ];
     configuration = ''
-      [core]
-      cache_dir = $XDG_CACHE_DIR/cache/mopidy
-      config_dir = $XDG_CONFIG_DIR/mopidy
-      data_dir = $XDG_DATA_DIR/lib/mopidy
-
-      [logging]
-      config_file = $XDG_CONFIG_DIR/mopidy/logging.conf
-
       [audio]
-      mixer = software
+      mixer = none
       mixer_volume =
       output = pulsesink server=127.0.0.1
       visualizer =
@@ -47,11 +39,6 @@
         .txt
 
       [mpd]
-      enabled = true
-      hostname = 127.0.0.1
-      port = 6600
-      password =
-      max_connections = 20
       zeroconf = ""
 
       [http]
@@ -65,7 +52,4 @@
       base_dir = /home/coolneng/Music
     '';
   };
-
-  # Give permissions to mopidy user
-  users.users.mopidy = { extraGroups = [ "audio" ]; };
 }
diff --git a/modules/gui.nix b/modules/gui.nix
index eb6c69c..1e89e07 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -11,6 +11,7 @@
         enable = true;
         user = "coolneng";
       };
+      greeter.package = pkgs.lightdm_gtk_greeter;
     };
   };
 
@@ -34,12 +35,15 @@
       kitty
     ];
     extraSessionCommands = ''
+      export MOZ_DBUS_REMOTE=1
       export GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots
       export _JAVA_AWT_WM_NONREPARENTING=1
       export QT_QPA_PLATFORM=wayland
       export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
       export SDL_VIDEODRIVER=wayland
+      export GTK_THEME=Adapta-Eta
     '';
+    wrapperFeatures.gtk = true;
   };
 
   # Backlight
@@ -65,5 +69,8 @@
   programs.waybar.enable = true;
 
   # GPG agent
-  programs.gnupg.agent = { enable = true; };
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryFlavor = "gnome3";
+  };
 }
diff --git a/modules/networking.nix b/modules/networking.nix
index 73028ce..d8776a2 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -3,7 +3,7 @@
 {
   environment.systemPackages = with pkgs; [ avahi wireguard ];
 
-  # Set hostname and hostid
+  # Set hostname, hostid and enable WiFi
   networking = {
     hostName = "panacea";
     hostId = "8feb0bb8";
@@ -34,4 +34,12 @@
     };
   };
 
+  # Enable localhost SSH
+  services.openssh = {
+    enable = true;
+    permitRootLogin = "yes";
+    passwordAuthentication = false;
+    openFirewall = false;
+    startWhenNeeded = true;
+  };
 }
diff --git a/modules/software.nix b/modules/software.nix
index 24ea21b..6e7c8d3 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -6,7 +6,7 @@
     htop
     # Password management
     gnupg
-    pinentry-curses
+    pinentry-gnome
     pass-wayland
     passff-host
     gitAndTools.pass-git-helper
@@ -34,7 +34,6 @@
     nixfmt
     podman-compose
     # Rice
-    gtk_engines
     adapta-gtk-theme
     paper-icon-theme
     # Audio
@@ -51,18 +50,23 @@
     isync
     notmuch
     msmtp
+    imapnotify
     w3m
     urlscan
+    # Media
+    gimp
+    # File management
+    zip
+    unzip
+    unrar
   ];
 
   # Fonts declaration
   fonts = {
     fonts = with pkgs; [
       google-fonts
-      siji
-      cherry
-      iosevka
       emacs-all-the-icons-fonts
+      terminus-nerdfont
     ];
   };