diff --git a/README.md b/README.md
index cb5c611..16900f0 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
   => is bloated (I use a lot of programs, sometimes just to try out)  
   => yet clean (follow XDG base directory specification)  
-  => for [bspwm](https://github.com/baskerville/bspwm), [spectrwm](https://github.com/conformal/spectrwm), [sway](https://github.com/swaywm/sway), [wayfire](https://github.com/WayfireWM/wayfire), [river](https://github.com/ifreund/river), [hikari](https://hikari.acmelabs.space/)  
+  => for [bspwm](https://github.com/baskerville/bspwm), [spectrwm](https://github.com/conformal/spectrwm), [sway](https://github.com/swaywm/sway), [wayfire](https://github.com/WayfireWM/wayfire), [river](https://github.com/ifreund/river), [hikari](https://hikari.acmelabs.space/) (and [exwm](https://github.com/ch11ng/exwm) occasionally)  
   => and features [Nord](https://github.com/arcticicestudio/nord) and [OneDark](https://github.com/joshdick/onedark.vim) colorschemes
 
 ![sway](https://git.disroot.org/FollieHiyuki/dotfiles/raw/branch/master/assets/sway.png)
@@ -50,6 +50,7 @@
 - [ ] NixOS / Guix / Gentoo / FreeBSD
 - [ ] New Neovim's config in Lua
 - [ ] My own ~/.emacs.d
+- [ ] Org Babel to manage dotfiles
 
 ### :star2: Credits & License
 
diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated
index 192033b..7d571b9 100644
--- a/home/.bashrc-bloated
+++ b/home/.bashrc-bloated
@@ -399,7 +399,7 @@ alias vi='nvim -o "$(fzf)"'
 # emacs
 alias doom="$HOME/.config/emacs/bin/doom"
 alias e="emacs -nw"
-alias emacs="emacsclient -c -a 'emacs'"
+alias em="emacsclient -c -a 'emacs'"
 # rsync
 alias rsyncdir="rsync -uavP --delete-after"
 alias rsyncfile="rsync -avP"
diff --git a/home/.config/X11/xinitrc b/home/.config/X11/xinitrc
index 4cd3b9c..f377717 100644
--- a/home/.config/X11/xinitrc
+++ b/home/.config/X11/xinitrc
@@ -2,18 +2,8 @@
 
 userresources=$HOME/.config/X11/Xresources
 usermodmap=$HOME/.config/X11/Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
 if [ -f "$userresources" ]; then
     xrdb -merge "$userresources"
 fi
@@ -22,23 +12,15 @@ if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"
 fi
 
-# start some nice programs
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-    for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-        [ -x "$f" ] && . "$f"
-    done
-    unset f
-fi
-
 pipewire &
-if ! pgrep -f mpd > /dev/null ;
+if ! pgrep -f mpd > /dev/null
 then
   mpd &
 fi
 dunst &
 greenclip daemon &
 ibus-daemon -drx &
-emacs --daemon &
+# emacs --daemon &
 picom -b &
 # xrandr --output eDP-1 --primary --auto --output DP-2 --left-of eDP-1 --auto --output HDMI-2 --right-of eDP-1 --auto &
 # $HOME/.local/bin/garbage/off_touch &
@@ -53,5 +35,6 @@ session=${1:-spectrwm}
 case $session in
   bspwm    ) exec bspwm ;;
   spectrwm ) exec spectrwm -c ~/.config/spectrwm/spectrwm-nord.conf ;;
+  exwm     ) exec dbus-run-session emacs -mm --debug-init -l ~/.config/doom/exwm.el ;;
   *        ) exec "$1" ;;
 esac
diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el
index 9b0dc0d..0f15ddd 100644
--- a/home/.config/doom/config.el
+++ b/home/.config/doom/config.el
@@ -34,7 +34,10 @@
 ;;      (delete ".." (directory-files (expand-file-name "images" doom-private-dir))))))
 (setq +doom-dashboard-banner-file "yukino.png"
       +doom-dashboard-banner-dir (expand-file-name "images" doom-private-dir)
-      +doom-dashboard-banner-padding '(0 . 2))
+      +doom-dashboard-banner-padding '(0 . 2)
+      +doom-dashboard-functions '(doom-dashboard-widget-banner
+                                  doom-dashboard-widget-shortmenu
+                                  doom-dashboard-widget-loaded))
 
 ;; Line number
 (setq display-line-numbers-type 'relative)
@@ -47,8 +50,8 @@
       standard-indent 2
       line-spacing 2)
 (after! highlight-indent-guides
-  (setq highlight-indent-guides-method 'character
-        highlight-indent-guides-responsive t))
+      (setq highlight-indent-guides-method 'character
+            highlight-indent-guides-responsive t))
 
 ;; Use ranger.el instead of default dired
 (after! ranger
@@ -65,9 +68,9 @@
 
 ;; lsp
 (after! company
-  (setq company-idle-delay 0.5
-        company-minimum-prefix-length 2)
-  (setq company-show-numbers nil))
+      (setq company-idle-delay 0.5
+            company-minimum-prefix-length 2)
+      (setq company-show-numbers nil))
 (setq lsp-clients-clangd-args '("-j=2"
                                 "--background-index"
                                 "--clang-tidy"
@@ -125,9 +128,10 @@
 ;;      "e n" #'emms-next)
 
 ;; Modeline
-;;(display-time-mode 1)
-;;(if (not (equal "Battery status not available" (battery)))
-;;  (display-battery-mode 1))
+(setq display-time-day-and-date t)
+(display-time-mode 1)
+(if (not (equal "Battery status not available" (battery)))
+      (display-battery-mode 1))
 ;;(emms-mode-line 1)
 (setq doom-modeline-unicode-fallback t)
 
diff --git a/home/.config/doom/packages.el b/home/.config/doom/packages.el
index 7a2b8ab..e4f6869 100644
--- a/home/.config/doom/packages.el
+++ b/home/.config/doom/packages.el
@@ -50,6 +50,8 @@
 ;(unpin! t)
 
 ;; Emacs is an OS
+(package! exwm)
+(package! desktop-environment)
 ;;(package! emms)
 
 ;; Syntax
diff --git a/home/.config/fish/conf.d/aliases.fish b/home/.config/fish/conf.d/aliases.fish
index cb390ee..9948416 100644
--- a/home/.config/fish/conf.d/aliases.fish
+++ b/home/.config/fish/conf.d/aliases.fish
@@ -35,7 +35,7 @@ abbr vi 'nvim -o (fzf)'
 # emacs
 alias doom='$HOME/.config/emacs/bin/doom'
 abbr e 'emacs -nw'
-alias emacs="emacsclient -c -a 'emacs'"
+abbr em "emacsclient -c -a 'emacs'"
 # rsync
 abbr rsyncdir "rsync -uavP --delete-after"
 abbr rsyncfile "rsync -avP"
diff --git a/home/.config/nvim/coc-settings.json b/home/.config/nvim/coc-settings.json
index 6312fef..aa9acc3 100644
--- a/home/.config/nvim/coc-settings.json
+++ b/home/.config/nvim/coc-settings.json
@@ -81,7 +81,7 @@
   "python.linting.enabled": true,
   "python.linting.banditEnabled": true,
   "clangd.arguments": [
-    "-j=3",
+    "-j=2",
     "--background-index",
     "--clang-tidy",
     "--completion-style=detailed",
diff --git a/home/.config/wayfire.ini b/home/.config/wayfire.ini
index 9c23f5c..9b286c5 100644
--- a/home/.config/wayfire.ini
+++ b/home/.config/wayfire.ini
@@ -118,7 +118,7 @@ idle = swayidle -w before-sleep swaylock
 
 # XDG desktop portal
 # Needed by some GTK applications
-# portal = /usr/libexec/xdg-desktop-portal
+portal = /usr/libexec/xdg-desktop-portal
 
 pipewire = pipewire
 
diff --git a/home/.config/zsh/aliases.zsh b/home/.config/zsh/aliases.zsh
index a481bed..ece512a 100644
--- a/home/.config/zsh/aliases.zsh
+++ b/home/.config/zsh/aliases.zsh
@@ -30,7 +30,7 @@ alias vi='nvim -o "$(fzf)"'
 # emacs
 alias doom="$HOME/.config/emacs/bin/doom"
 alias e="emacs -nw"
-alias emacs="emacsclient -c -a 'emacs'"
+alias em="emacsclient -c -a 'emacs'"
 # rsync
 alias rsyncdir="rsync -uavP --delete-after"
 alias rsyncfile="rsync -avP"
diff --git a/home/.local/share/zsh/abbreviations b/home/.local/share/zsh/abbreviations
index 80c560a..71918aa 100644
--- a/home/.local/share/zsh/abbreviations
+++ b/home/.local/share/zsh/abbreviations
@@ -10,6 +10,8 @@ abbr no="grep -viP"
 abbr sduo="sudo"
 abbr v="nvim"
 abbr vi='nvim -o "$(fzf)"'
+abbr e='emacs -nw'
+abbr em="emacsclient -c -a 'emacs'"
 abbr youbest="youtube-dl -f bestvideo+bestaudio"
 abbr youflac="youtube-dl --extract-audio --audio-format flac"
 abbr youlist="youtube-dl -f bestvideo+bestaudio --yes-playlist"