diff --git a/dotfiles/.config/i3/config b/dotfiles/.config/i3/config
index 9bde444..dfeb6f2 100644
--- a/dotfiles/.config/i3/config
+++ b/dotfiles/.config/i3/config
@@ -3,10 +3,6 @@ set $mod Mod4
 # Set font
 font pango:monospace 8
 
-# Configure betterlockscreen
-exec --no-startup-id "betterlockscreen --fx dim -u $HOME/Pictures/wallpaper-*"
-bindsym $mod+Shift+x exec "betterlockscreen -l dim -w"
-
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
@@ -142,8 +138,8 @@ bindsym l resize shrink width 10 px or 10 ppt
 bindsym $mod+r mode "resize"
 
 # Brightness keys setup
-bindsym XF86MonBrightnessDown exec --no-startup-id "doas $HOME/.scripts/brightness.sh -5"
-bindsym XF86MonBrightnessUp exec --no-startup-id "doas $HOME/.scripts/brightness.sh 5"
+bindsym XF86MonBrightnessDown exec --no-startup-id "sudo $HOME/.scripts/brightness.sh -5"
+bindsym XF86MonBrightnessUp exec --no-startup-id "sudo $HOME/.scripts/brightness.sh 5"
 
 # Window Cosmetic Changes
 gaps inner 5
@@ -153,8 +149,8 @@ client.focused_inactive #333333 #222222 #888888 #292d2e #eeeeee
 client.unfocused #333333 #222222 #888888 #292d2e #eeeeee
 
 # Startup Applications
-exec --no-startup-id "lxpolkit &" # start authentication agent (prompt)
+exec_always  --no-startup-id "$HOME/.screenlayout/launch.sh &" # setup screen layout and wallpapers
+exec_always  --no-startup-id "$HOME/.scripts/autostart_desktop.sh &" # run autostart desktop apps
+exec --no-startup-id "polybar &" # status bar
 exec --no-startup-id "picom &" # startup composition manager (transparency)
-exec --no-startup-id "polybar" # status bar
-exec --no-startup-id "$HOME/.scripts/autostart_desktop.sh &" # run autostart desktop apps
 exec --no-startup-id "emacs --daemon &" # startup emacs daemon
diff --git a/dotfiles/.emacs.d/config.org b/dotfiles/.emacs.d/config.org
index 5e13a5c..8b185bb 100644
--- a/dotfiles/.emacs.d/config.org
+++ b/dotfiles/.emacs.d/config.org
@@ -150,7 +150,7 @@ Pretty self explanatory.
 
 #+begin_src emacs-lisp
   (defun jm/set-font-faces ()
-      (set-face-attribute 'default nil :font "Fira Code Retina" :height 140))
+      (set-face-attribute 'default nil :font "Fira Code" :height 140))
 #+end_src
 
 Adding a fix for fonts when running Emacs as a daemon.
diff --git a/dotfiles/.emacs.d/email.org b/dotfiles/.emacs.d/email.org
index 23eb28c..a11286d 100644
--- a/dotfiles/.emacs.d/email.org
+++ b/dotfiles/.emacs.d/email.org
@@ -72,6 +72,8 @@ From here, I can continue onto configuring the ~mu4e~ emacs package.
   :load-path jm/mu4e-load-path
   :bind ("C-x m" . mu4e)
   :config
+  (setq mu4e-mu-binary (executable-find "mu"))
+
   ;; Avoids syncing issues.
   (setq mu4e-change-filenames-when-moving t)
 
diff --git a/home-manager/home.nix b/home-manager/home.nix
index ef9740d..6bafc9b 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -15,17 +15,18 @@
     bitwarden-cli
     bitwarden
     discord
-    isync
-    emacsPackages.all-the-icons-nerd-fonts
+    meslo-lgs-nf
+    fira-code
   ];
 
   home.file = {
-    ".scripts".source = ../dotfiles/.scripts;
     ".mbsyncrc".source = ../dotfiles/.mbsyncrc;
     ".Xresources".source = ../dotfiles/.Xresources;
-    ".screenlayout".source = ../dotfiles/.screenlayout;
+    ".scripts/brightness.sh".source = ../dotfiles/.scripts/brightness.sh;
+    ".scripts/autostart_desktop.sh".source = ../dotfiles/.scripts/autostart_desktop.sh;
+    ".screenlayout/launch.sh".source = ../dotfiles/.screenlayout/launch.sh;
+    ".screenlayout/wallpapers.sh".source = ../dotfiles/.screenlayout/wallpapers.sh;
     ".config/i3/config".source = ../dotfiles/.config/i3/config;
-    ".local/share/fonts".source = ../dotfiles/.local/share/fonts;
     ".config/rofi/config.rasi".source = ../dotfiles/.config/rofi/config.rasi;
     ".config/polybar/config.ini".source = ../dotfiles/.config/polybar/config.ini;
 
@@ -41,11 +42,10 @@
 
   programs = {
     home-manager.enable = true;
-    emacs.enable = true;
+    command-not-found.enable = true;
     zoxide.enable = true;
     eza.enable = true;
     fzf.enable = true;
-    command-not-found.enable = true;
 
     git = {
       enable = true;
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index b3c0e52..77b0a9e 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -112,10 +112,16 @@
     vim
     git
     picom
+    emacs
+    mu
     cmake
-    emacsPackages.vterm
+    isync
+    ispell
     emacsPackages.mu4e
+    emacsPackages.vterm
+    emacsPackages.all-the-icons
+    emacsPackages.nerd-icons
   ];
-  system.stateVersion = "23.11";
 
+  system.stateVersion = "23.11";
 }