diff --git a/hosts/biolimo/.config/sway/config.d/custom-keybindings.conf b/hosts/biolimo/.config/sway/config.d/custom-keybindings.conf
index 4a95431..4aa62cb 100644
--- a/hosts/biolimo/.config/sway/config.d/custom-keybindings.conf
+++ b/hosts/biolimo/.config/sway/config.d/custom-keybindings.conf
@@ -8,12 +8,3 @@ bindsym XF86MonBrightnessDown exec "brightnessctl -d intel_backlight set 10%-; n
 # Keyboard backlight brightness controls
 bindsym XF86KbdBrightnessDown exec "brightnessctl -d smc::kbd_backlight set 10%-; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ {    print $4}')"
 bindsym XF86KbdBrightnessUp exec "brightnessctl -d smc::kbd_backlight set +10%; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ {    print $4}')"
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. up' #increase sound volume
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. down' #decrease sound volume
-bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && notify-send 'Mute sound' # mute sound
-# Media player controls
-bindsym XF86AudioPlay exec "playerctl play-pause; notify-send 'Play/Pause'"
-bindsym XF86AudioNext exec "playerctl next; notify-send 'Next'"
-bindsym XF86AudioPrev exec "playerctl previous; notify-send 'Prev.'"
diff --git a/hosts/chocolatebar/.config/sway/config.d/custom-keybindings.conf b/hosts/chocolatebar/.config/sway/config.d/custom-keybindings.conf
index 4a95431..e69de29 100644
--- a/hosts/chocolatebar/.config/sway/config.d/custom-keybindings.conf
+++ b/hosts/chocolatebar/.config/sway/config.d/custom-keybindings.conf
@@ -1,19 +0,0 @@
-# Touchpad controls
-#bindsym XF86TouchpadToggle exec $HOME/Workspace/ben/toggletouchpad.sh # toggle touchpad
-
-# Screen brightness controls
-bindsym XF86MonBrightnessUp exec "brightnessctl -d intel_backlight set +10%; notify-send $(brightnessctl -d intel_backlight i | awk '/Current/ {print $4}')"
-bindsym XF86MonBrightnessDown exec "brightnessctl -d intel_backlight set 10%-; notify-send $(brightnessctl -d intel_backlight i | awk '/Current/ {    print $4}')"
-
-# Keyboard backlight brightness controls
-bindsym XF86KbdBrightnessDown exec "brightnessctl -d smc::kbd_backlight set 10%-; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ {    print $4}')"
-bindsym XF86KbdBrightnessUp exec "brightnessctl -d smc::kbd_backlight set +10%; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ {    print $4}')"
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. up' #increase sound volume
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. down' #decrease sound volume
-bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && notify-send 'Mute sound' # mute sound
-# Media player controls
-bindsym XF86AudioPlay exec "playerctl play-pause; notify-send 'Play/Pause'"
-bindsym XF86AudioNext exec "playerctl next; notify-send 'Next'"
-bindsym XF86AudioPrev exec "playerctl previous; notify-send 'Prev.'"
diff --git a/hosts/stroopwafel/.config/sway/config.d/custom-keybindings.conf b/hosts/stroopwafel/.config/sway/config.d/custom-keybindings.conf
index d3c6eed..e94d5c1 100644
--- a/hosts/stroopwafel/.config/sway/config.d/custom-keybindings.conf
+++ b/hosts/stroopwafel/.config/sway/config.d/custom-keybindings.conf
@@ -8,12 +8,3 @@ bindsym XF86MonBrightnessDown exec "brightnessctl -d amdgpu_bl0 set 10%-; notify
 # Keyboard backlight brightness controls
 bindsym XF86KbdBrightnessDown exec "brightnessctl -d smc::kbd_backlight set 10%-; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ {    print $4}')"
 bindsym XF86KbdBrightnessUp exec "brightnessctl -d smc::kbd_backlight set +10%; notify-send $(brightnessctl -d smc::kbd_backlight i | awk '/Current/ {    print $4}')"
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. up' #increase sound volume
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. down' #decrease sound volume
-bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && notify-send 'Mute sound' # mute sound
-# Media player controls
-bindsym XF86AudioPlay exec "playerctl play-pause; notify-send 'Play/Pause'"
-bindsym XF86AudioNext exec "playerctl next; notify-send 'Next'"
-bindsym XF86AudioPrev exec "playerctl previous; notify-send 'Prev.'"
diff --git a/modules/graphical/.config/user-dirs.dirs b/modules/graphical/.config/user-dirs.dirs
deleted file mode 100644
index a1bf8b4..0000000
--- a/modules/graphical/.config/user-dirs.dirs
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is written by xdg-user-dirs-update
-# If you want to change or add directories, just edit the line you're
-# interested in. All local changes will be retained on the next run.
-# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
-# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
-# absolute path. No other format is supported.
-
-XDG_DESKTOP_DIR="$HOME/"
-XDG_DOWNLOAD_DIR="$HOME/Downloads"
-XDG_TEMPLATES_DIR="$HOME/Templates"
-XDG_PUBLICSHARE_DIR="$HOME/Public"
-XDG_DOCUMENTS_DIR="$HOME/"
-XDG_MUSIC_DIR="$HOME/"
-XDG_PICTURES_DIR="$HOME/"
-XDG_VIDEOS_DIR="$HOME/"
diff --git a/modules/graphical/.config/xsettingsd/xsettingsd.conf b/modules/graphical/.config/xsettingsd/xsettingsd.conf
deleted file mode 100644
index 8ea990f..0000000
--- a/modules/graphical/.config/xsettingsd/xsettingsd.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-Gtk/ButtonImages 1
-Gtk/CanChangeAccels 1
-Gtk/CursorThemeName "default"
-Gtk/CursorThemeSize 0
-Gtk/EnableEventSounds 0
-Gtk/EnableInputFeedbackSounds 0
-Gtk/FontName "Lato"
-Gtk/ThemeName "Matcha-dark-aliz"
-Gtk/IconThemeName "Papirus-Adapta-Nokto-Maia"
-Gtk/MenuBarAccel "F10"
-Gtk/MenuImages 1
-Gtk/ToolbarIconSize 3
-Gtk/ToolbarStyle "icons"
-Xft/Antialias 1
-Xft/DPI 102400
-Xft/Hinting 1
-Xft/HintStyle "hintslight"
-Xft/RGBA "rgb"
diff --git a/modules/graphical/.xinitrc b/modules/graphical/.xinitrc
index d961f66..69dcff3 100644
--- a/modules/graphical/.xinitrc
+++ b/modules/graphical/.xinitrc
@@ -9,8 +9,6 @@ usermodmap=$HOME/.config/xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
-DEFAULT_SESSION='i3 --shmlog-size 0'
-
 xset -b
 
 if [ -d $HOME/.fonts ]; then
@@ -48,23 +46,8 @@ fi
 get_session(){
   local dbus_args=(--sh-syntax --exit-with-session)
   case $1 in
-    awesome) dbus_args+=(awesome) ;;
-    bspwm) dbus_args+=(bspwm-session) ;;
-    budgie) dbus_args+=(budgie-desktop) ;;
-    cinnamon) dbus_args+=(cinnamon-session) ;;
-    deepin) dbus_args+=(startdde) ;;
-    enlightenment) dbus_args+=(enlightenment_start) ;;
-    fluxbox) dbus_args+=(startfluxbox) ;;
-    gnome) dbus_args+=(gnome-session) ;;
     i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;;
-    jwm) dbus_args+=(jwm) ;;
-    kde) dbus_args+=(startkde) ;;
-    lxde) dbus_args+=(startlxde) ;;
-    lxqt) dbus_args+=(lxqt-session) ;;
-    mate) dbus_args+=(mate-session) ;;
-    xfce) dbus_args+=(xfce4-session) ;;
-    openbox) dbus_args+=(openbox-session) ;;
-    *) dbus_args+=($DEFAULT_SESSION) ;;
+    *) dbus_args+=(sway) ;;
   esac
 
   echo "dbus-launch ${dbus_args[*]}"
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 244f602..c35634c 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -93,14 +93,11 @@ in {
 
     users.users."${psCfg.user.name}".packages = with pkgs; [
       alacritty
-      firefox-wayland
-      flameshot
       gnome.adwaita-icon-theme
       gnome.eog
       gnome.nautilus
       gnome.seahorse
       gnome.yelp
-      hicolor-icon-theme
       keepassxc
       libnotify
       toggle-kbd-layout
@@ -113,12 +110,15 @@ in {
       home.file."xinitrc".source = ./.xinitrc;
       xdg.configFile."alacritty/alacritty.toml".source = tomlFormat.generate "alacritty.toml" ((import ./alacritty.nix) args);
       xdg.configFile."xmodmap".source = ./.config/xmodmap;
-      xdg.configFile."user-dirs.dirs".source = ./.config/user-dirs.dirs;
       xdg.configFile."user-dirs.locale".source = ./.config/user-dirs.locale;
-      xdg.configFile."xsettingsd/xsettingsd.conf".source = ./.config/xsettingsd/xsettingsd.conf;
       xdg.configFile."libinput-gestures.conf".source = ./.config/libinput-gestures.conf;
       xdg.configFile."wallpaper.jpg".source = ./assets/wallpaper.jpg;
 
+      programs.firefox = {
+        enable = true;
+        package = pkgs.firefox-wayland;
+      };
+
       dconf.settings = {
         "org/gnome/desktop/interface" = {
           color-scheme = "prefer-dark";
diff --git a/modules/graphical/sway/config/config.d/custom-keybindings.conf b/modules/graphical/sway/config/config.d/custom-keybindings.conf
index 54a4941..00734d3 100644
--- a/modules/graphical/sway/config/config.d/custom-keybindings.conf
+++ b/modules/graphical/sway/config/config.d/custom-keybindings.conf
@@ -1,43 +1,25 @@
-# launch categorized menu
-bindsym $mod+z exec --no-startup-id morc_menu
-
 # switch keyboard input language
 bindsym $mod+tab exec toggle-kbd-layout
 
-################################################################################################
-## sound-section -  ##
-################################################################################################
-
-bindsym $mod+Ctrl+m exec pavucontrol
-
-################################################################################################
-
-# Quickstart application shortcuts
-bindsym $mod+F1 exec psos help
-bindsym $mod+Shift+h exec psos help
-
-bindsym $mod+F2 exec firefox
-
-bindsym $mod+F4 exec nautilus -w
-bindsym $mod+Shift+F4 exec signal-desktop --use-tray-icon
-
-bindsym $mod+Shift+m exec qMasterPassword
-
-# Screenshots and screen recordings
+# Screen capturing
 bindsym $mod+Ctrl+p exec grim -g "$(slurp -d -b \#ffffff11)" ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
-bindsym $mod+Shift+p exec grim ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
-bindsym $mod+Ctrl+f exec "( pkill flameshot || true && flameshot & ) && ( sleep 0.5s && flameshot gui )"
+bindsym $mod+Shift+p exec grim -g "$(slurp -d -b \#ffffff11 -o)" ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
 
 bindsym $mod+Ctrl+r exec record-screen
+bindsym $mod+Shift+r exec record-screen -o
 
 # Launcher
 set $menu exec alacritty --class launcher -e env TERMINAL_COMMAND="alacritty -e" sway-launcher
 bindsym $mod+Space exec $menu
 
-set $mode_vncclient In VNCClient mode. Press $mod+Num_Lock or $mod+Shift+Escape to return.
-bindsym $mod+Num_Lock mode "$mode_vncclient"
-bindsym $mod+Shift+Escape mode "$mode_vncclient"
-mode "$mode_vncclient" {
-    bindsym $mod+Num_Lock mode "default"
-    bindsym $mod+Shift+Escape mode "default"
-}
+# Pulse Audio controls
+bindsym $mod+Ctrl+m exec pavucontrol
+
+bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. up' #increase sound volume
+bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 && notify-send 'Vol. down' #decrease sound volume
+bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && notify-send 'Mute sound' # mute sound
+
+# Media player controls
+bindsym XF86AudioPlay exec "playerctl play-pause; notify-send 'Play/Pause'"
+bindsym XF86AudioNext exec "playerctl next; notify-send 'Next'"
+bindsym XF86AudioPrev exec "playerctl previous; notify-send 'Prev.'"
diff --git a/modules/graphical/sway/config/config.d/keepalive.conf b/modules/graphical/sway/config/config.d/keepalive.conf
new file mode 100644
index 0000000..90a0612
--- /dev/null
+++ b/modules/graphical/sway/config/config.d/keepalive.conf
@@ -0,0 +1 @@
+for_window [app_id=".*"] inhibit_idle fullscreen
diff --git a/modules/graphical/sway/default.nix b/modules/graphical/sway/default.nix
index bba119f..abfb452 100644
--- a/modules/graphical/sway/default.nix
+++ b/modules/graphical/sway/default.nix
@@ -60,8 +60,6 @@ in {
       wl-clipboard
       wf-recorder
       brightnessctl
-      gammastep
-      geoclue2
       xsettingsd
       ydotool
 
@@ -72,10 +70,17 @@ in {
       wcwd
     ];
 
+    services.geoclue2.enable = true;
+
     home-manager.users."${psCfg.user.name}" = {
-      systemd.user.services.sway = import ./sway.service.nix {inherit pkgs psCfg;};
-      systemd.user.services.xsettingsd = import ./xsettingsd.service.nix {inherit pkgs psCfg;};
-      systemd.user.targets.sway-session = import ./sway-session.target.nix {inherit pkgs psCfg;};
+      systemd.user.services.sway = import ./sway.service.nix args;
+      systemd.user.targets.sway-session = import ./sway-session.target.nix args;
+
+      services.xsettingsd.enable = true;
+      services.gammastep = {
+        enable = true;
+        provider = "geoclue2";
+      };
 
       xdg.configFile."sway/config".text = import ./config/config.nix args;
 
diff --git a/modules/graphical/sway/gammastep.service.nix b/modules/graphical/sway/gammastep.service.nix
deleted file mode 100644
index d488ea5..0000000
--- a/modules/graphical/sway/gammastep.service.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  Unit = {
-    Description = "set color temperature of display according to time of day";
-    Documentation = ["man:gammastep(1)"];
-    BindsTo = ["sway-session.target"];
-    After = ["sway-session.target"];
-    # ConditionEnvironment requires systemd v247 to work correctly
-    ConditionEnvironment = ["WAYLAND_DISPLAY"];
-  };
-  Service = {
-    Type = "simple";
-    ExecStart = "${pkgs.gammastep}/bin/gammastep -l geoclue2 -m wayland -v";
-  };
-  Install = {
-    WantedBy = ["sway-session.target"];
-  };
-}
diff --git a/modules/graphical/sway/xsettingsd.service.nix b/modules/graphical/sway/xsettingsd.service.nix
deleted file mode 100644
index 3905726..0000000
--- a/modules/graphical/sway/xsettingsd.service.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{pkgs, ...}: {
-  Unit = {
-    Description = "X Settings Daemon";
-    Documentation = ["https://github.com/derat/xsettingsd/wiki/Installation"];
-    BindsTo = ["sway-session.target"];
-    After = ["sway-session.target"];
-    # ConditionEnvironment requires systemd v247 to work correctly
-    ConditionEnvironment = ["WAYLAND_DISPLAY"];
-  };
-  Service = {
-    Type = "simple";
-    ExecStart = "${pkgs.xsettingsd}/bin/xsettingsd";
-    ExecStop = "/run/current-system/sw/bin/env pkill xsettingsd";
-  };
-  Install = {
-    WantedBy = ["sway-session.target"];
-  };
-}
diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 1d4d905..f03fd6e 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -20,7 +20,7 @@ in {
   };
 
   config = {
-    programs.command-not-found.enable = false;
+    programs.command-not-found.enable = true;
 
     users.users."${psCfg.user.name}".packages = with pkgs;
       [
diff --git a/modules/user/.config/dircolors b/modules/user/.config/dircolors
deleted file mode 100644
index 16b9bb1..0000000
--- a/modules/user/.config/dircolors
+++ /dev/null
@@ -1,243 +0,0 @@
-# Configuration file for dircolors, a utility to help you set the
-# LS_COLORS environment variable used by GNU ls with the --color option.
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-# Copying and distribution of this file, with or without modification,
-# are permitted provided the copyright notice and this notice are preserved.
-
-# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
-# slackware version of dircolors) are recognized but ignored.
-
-# You can copy this file to .dir_colors in your $HOME directory to override
-# the system defaults.
-
-# Below, there should be one TERM entry for each termtype that is colorizable
-TERM Eterm
-TERM ansi
-TERM color-xterm
-TERM con132x25
-TERM con132x30
-TERM con132x43
-TERM con132x60
-TERM con80x25
-TERM con80x28
-TERM con80x30
-TERM con80x43
-TERM con80x50
-TERM con80x60
-TERM cons25
-TERM console
-TERM cygwin
-TERM dtterm
-TERM eterm-color
-TERM gnome
-TERM gnome-256color
-TERM hurd
-TERM jfbterm
-TERM konsole
-TERM kterm
-TERM linux
-TERM linux-c
-TERM mach-color
-TERM mach-gnu-color
-TERM mlterm
-TERM putty
-TERM putty-256color
-TERM rxvt
-TERM rxvt-256color
-TERM rxvt-cygwin
-TERM rxvt-cygwin-native
-TERM rxvt-unicode
-TERM rxvt-unicode-256color
-TERM rxvt-unicode256
-TERM screen
-TERM screen-256color
-TERM screen-256color-bce
-TERM screen-bce
-TERM screen-w
-TERM screen.Eterm
-TERM screen.rxvt
-TERM screen.linux
-TERM st
-TERM st-256color
-TERM terminator
-TERM vt100
-TERM xterm
-TERM xterm-16color
-TERM xterm-256color
-TERM xterm-88color
-TERM xterm-color
-TERM xterm-debian
-
-# Below are the color init strings for the basic file types. A color init
-# string consists of one or more of the following numeric codes:
-# Attribute codes:
-# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
-# Text color codes:
-# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
-# Background color codes:
-# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
-#NORMAL 00	# no color code at all
-#FILE 00	# regular file: use no color at all
-RESET 0		# reset to "normal" color
-DIR 01;34	# directory
-LINK 01;36	# symbolic link.  (If you set this to 'target' instead of a
-                # numerical value, the color is as for the file pointed to.)
-MULTIHARDLINK 00	# regular file with more than one link
-FIFO 40;33	# pipe
-SOCK 01;35	# socket
-DOOR 01;35	# door
-BLK 40;33;01	# block device driver
-CHR 40;33;01	# character device driver
-ORPHAN 01;05;37;41  # orphaned syminks
-MISSING 01;05;37;41 # ... and the files they point to
-SETUID 37;41	# file that is setuid (u+s)
-SETGID 30;43	# file that is setgid (g+s)
-CAPABILITY 30;41	# file with capability
-STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
-OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
-STICKY 37;44	# dir with the sticky bit set (+t) and not other-writable
-
-# This is for files with execute permission:
-EXEC 01;32
-
-# List any file extensions like '.gz' or '.tar' that you would like ls
-# to colorize below. Put the extension, a space, and the color init string.
-# (and any comments you want to add after a '#')
-
-# If you use DOS-style suffixes, you may want to uncomment the following:
-#.cmd 01;32 # executables (bright green)
-#.exe 01;32
-#.com 01;32
-#.btm 01;32
-#.bat 01;32
-# Or if you want to colorize scripts even if they do not have the
-# executable bit actually set.
-#.sh  01;32
-#.csh 01;32
-
-# archives or compressed (bright red)
-.tar 01;31
-.tgz 01;31
-.arc 01;31
-.arj 01;31
-.taz 01;31
-.lha 01;31
-.lz4 01;31
-.lzh 01;31
-.lzma 01;31
-.tlz 01;31
-.txz 01;31
-.tzo 01;31
-.t7z 01;31
-.zip 01;31
-.z   01;31
-.Z   01;31
-.dz  01;31
-.gz  01;31
-.lrz 01;31
-.lz  01;31
-.lzo 01;31
-.xz  01;31
-.bz2 01;31
-.bz  01;31
-.tbz 01;31
-.tbz2 01;31
-.tz  01;31
-.deb 01;31
-.rpm 01;31
-.jar 01;31
-.war 01;31
-.ear 01;31
-.sar 01;31
-.rar 01;31
-.alz 01;31
-.ace 01;31
-.zoo 01;31
-.cpio 01;31
-.7z  01;31
-.rz  01;31
-.cab 01;31
-
-# image formats
-.jpg 01;35
-.jpeg 01;35
-.gif 01;35
-.bmp 01;35
-.pbm 01;35
-.pgm 01;35
-.ppm 01;35
-.tga 01;35
-.xbm 01;35
-.xpm 01;35
-.tif 01;35
-.tiff 01;35
-.png 01;35
-.svg 01;35
-.svgz 01;35
-.mng 01;35
-.pcx 01;35
-.mov 01;35
-.mpg 01;35
-.mpeg 01;35
-.m2v 01;35
-.mkv 01;35
-.webm 01;35
-.ogm 01;35
-.mp4 01;35
-.m4v 01;35
-.mp4v 01;35
-.vob 01;35
-.qt  01;35
-.nuv 01;35
-.wmv 01;35
-.asf 01;35
-.rm  01;35
-.rmvb 01;35
-.flc 01;35
-.avi 01;35
-.fli 01;35
-.flv 01;35
-.gl 01;35
-.dl 01;35
-.xcf 01;35
-.xwd 01;35
-.yuv 01;35
-.cgm 01;35
-.emf 01;35
-
-# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axv 01;35
-.anx 01;35
-.ogv 01;35
-.ogx 01;35
-
-# Document files
-.pdf 00;32
-.ps 00;32
-.txt 00;32
-.patch 00;32
-.diff 00;32
-.log 00;32
-.tex 00;32
-.doc 00;32
-
-# audio formats
-.aac 00;36
-.au 00;36
-.flac 00;36
-.m4a 00;36
-.mid 00;36
-.midi 00;36
-.mka 00;36
-.mp3 00;36
-.mpc 00;36
-.ogg 00;36
-.ra 00;36
-.wav 00;36
-
-# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axa 00;36
-.oga 00;36
-.spx 00;36
-.xspf 00;36
diff --git a/modules/user/home.nix b/modules/user/home.nix
index ea1e07b..056d335 100644
--- a/modules/user/home.nix
+++ b/modules/user/home.nix
@@ -27,22 +27,7 @@ in {
     xdg.enable = true;
     xdg.mime.enable = true;
     xdg.mimeApps = import ./mimeapps.nix;
-
-    xdg.configFile."dircolors".source = ./.config/dircolors;
-
-    xdg.dataFile."shell.nix.tmpl" = {
-      text = ''
-        let
-          unstable = import (fetchTarball https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz) { };
-        in
-        { nixpkgs ? import <nixpkgs> {} }:
-        with nixpkgs; mkShell {
-          buildInputs = [
-          ];
-        }
-      '';
-      target = "nvim/templates/shell.nix.tmpl";
-    };
+    xdg.userDirs.enable = true;
 
     # Allow unfree packages only on a user basis, not on a system-wide basis
     xdg.configFile."nixpkgs/config.nix".text = " { allowUnfree = true; } ";
diff --git a/modules/user/mimeapps.nix b/modules/user/mimeapps.nix
index ab3fd49..3864f6e 100644
--- a/modules/user/mimeapps.nix
+++ b/modules/user/mimeapps.nix
@@ -2,7 +2,7 @@
   enable = true;
   defaultApplications = {
     "application/octet-stream" = ["firefox.desktop"];
-    "application/pdf" = ["org.gnome.Evince.desktop"];
+    "application/pdf" = ["firefox.desktop"];
     "application/x-bittorrent" = ["deluge.desktop"];
     "application/x-extension-htm" = ["firefox.desktop"];
     "application/x-extension-html" = ["firefox.desktop"];
diff --git a/pkgs/record-screen.nix b/pkgs/record-screen.nix
index eb2d0bf..0eb6f2f 100644
--- a/pkgs/record-screen.nix
+++ b/pkgs/record-screen.nix
@@ -1,11 +1,28 @@
 self:
 with self; ''
+  set -e
+
+  RECORDER_PID=$(${procps}/bin/ps aux | ${gnugrep}/bin/grep "\--class screen-recorder" | ${gnugrep}/bin/grep -v grep | ${gawk}/bin/awk '{print $2}')
+  NUM_PID=$(echo -n $RECORDER_PID | ${coreutils}/bin/wc -w)
+  if (( NUM_PID > 0 )); then
+    FILE_LOCATION=$(${procps}/bin/ps aux | ${gnugrep}/bin/grep "\--class screen-recorder" | ${gnugrep}/bin/grep -v grep | ${gawk}/bin/awk '{print $NF}')
+    kill $RECORDER_PID
+    ${libnotify}/bin/notify-send "Recorded to $FILE_LOCATION"
+    exit 0
+  fi
+
+  if [ "$1" = "fullscreen" ]; then
+    GEOMETRY="$(${slurp}/bin/slurp -d -b \#ffffff11 -o)"
+  else
+    GEOMETRY="$(${slurp}/bin/slurp -d -b \#ffffff11)"
+  fi
+
   mkdir -p "$HOME/Videos/Screenrecordings"
-  GEOMETRY="$(slurp -d -b \#ffffff11)"
-  RESOLUTION="$(echo $GEOMETRY | awk '{print $2}')"
+  RESOLUTION="$(echo $GEOMETRY | ${gawk}/bin/awk '{print $2}')"
   FILE_LOCATION="$HOME/Videos/Screenrecordings/$(${coreutils}/bin/date +%Y%m%d_%Hh%Mm%Ss)_$RESOLUTION.mp4"
   echo "Recording $GEOMETRY into $FILE_LOCATION"
   ${alacritty}/bin/alacritty \
     --class screen-recorder \
     -e ${wf-recorder}/bin/wf-recorder -g "$GEOMETRY" -f "$FILE_LOCATION"
+  ${libnotify}/bin/notify-send "Recording to $FILE_LOCATION"
 ''
diff --git a/users/b12f/email.nix b/users/b12f/email.nix
index df376f3..3c32a2d 100644
--- a/users/b12f/email.nix
+++ b/users/b12f/email.nix
@@ -80,7 +80,6 @@ with lib; let
 in {
   users.users."${psCfg.user.name}".packages = with pkgs; [
     w3m
-    mailto-mutt
   ];
 
   home-manager.users."${psCfg.user.name}" = rec {
@@ -95,6 +94,15 @@ in {
       };
     };
 
+    xdg.desktopEntries.mailto-mutt = {
+      name = "Mutt";
+      genericName = "Email client";
+      exec = "${pkgs.mailto-mutt}/bin/mailto-mutt %U";
+      terminal = true;
+      categories = [ "Application" "Email" ];
+      mimeType = [ "message/rfc822" "message/partial" ];
+    };
+
     accounts.email = {
       inherit maildirBasePath;