diff --git a/.Xdefaults b/.Xdefaults
index b5e0ccf..b74b913 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -1,46 +1,60 @@
 ! $OpenBSD: dot.Xdefaults,v 1.3 2014/07/10 10:22:59 jasper Exp $
 
+! === XFT ===
 Xft.hinting: true
 Xft.hintstyle: hintfull
-Xft.dpi: 120
+Xft.dpi: 96
 
+! === XTerm ===
 XTerm*termName: xterm-256color
-XTerm*loginShell:true
-XTerm*faceName: ttyp0:size=9
+XTerm*loginShell: true
+XTerm*faceName: ttyp0:size=10
 XTerm*scrollBar: false
 XTerm*eightBitInput: false
 XTerm*locale: true
 XTerm*pointerMode: 2
 XTerm*scaleHeight: 1.1
-XTerm*internalBorder: 16
+XTerm*internalBorder: 14 
 XTerm.vt100.translations: #override \
 	Ctrl Shift <Key>V: insert-selection(CLIPBOARD) \n\
 	Ctrl Shift <Key>C: copy-selection(CLIPBOARD)
 
-*.foreground:	#e8e8d3
-*.background:	#151515
-*.cursorColor:	#cf6a4c
+Nsxiv.bar.font: ttyp0:size=10
 
-*.color0:	#151515
-*.color8:	#888888
+! special
+*.foreground:   #ffebeb
+*.background:   #0d0909
+*.cursorColor:  #e84f82
 
-*.color1:	#cf6a4c
-*.color9:	#cf6a4c
+! black
+*.color0:       #1a1111
+*.color8:       #403333
 
-*.color2:	#99ad6a
-*.color10:	#99ad6a
+! red
+*.color1:       #d12a62
+*.color9:       #e84f82
 
-*.color3:	#ffb964
-*.color11:	#ffb964
+! green
+*.color2:      #70cf53
+*.color10:       #8bd681
 
-*.color4:	#668799
-*.color12:	#668799
+! yellow
+*.color3:      #f37a21
+*.color11:      #f39d21
 
-*.color5:	#c6b6ee
-*.color13:	#c6b6ee
+! blue
+*.color4:     	#0065b0
+*.color12:      #0082cf
 
-*.color6:	#8fbfdc
-*.color14:	#8fbfdc
+! magenta
+*.color5:      #8542ff
+*.color13:       #9b64fb
+
+! cyan
+*.color6:      #42717b
+*.color14:       #6d878d
+
+! white
+*.color7:       #ad9191
+*.color15:      #ffebeb
 
-*.color7:	#888888
-*.color15:	#e8e8d3
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
deleted file mode 100644
index 8071a75..0000000
--- a/.config/nvim/init.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-vim.cmd.colo("jellybeans")
-
-vim.opt.termguicolors	= true
-vim.opt.showmode	= false
-vim.opt.laststatus	= 0
-vim.opt.autoindent	= true
-
-require "nvim-treesitter.configs".setup {
-	highlight = {
-		enable = true,
-		additional_vim_regex_highlighting = false,
-	},
-}
diff --git a/.config/picom.conf b/.config/picom.conf
deleted file mode 100644
index e76dfe7..0000000
--- a/.config/picom.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-vsync = true;
-xrender-sync = true;
-xrender-sync-fence = true;
diff --git a/.cwmrc b/.cwmrc
index a21504a..71705e5 100644
--- a/.cwmrc
+++ b/.cwmrc
@@ -1,18 +1,19 @@
 ignore bar
 autogroup 0 bar
+
 sticky yes
-gap 20 0 0 0
+gap 35 15 15 15
 snapdist 10
+vtile 60
 
 borderwidth 6
-fontname "ttyp0:size=9"
-color font		"#e8e8d3"
-color selfont		"#151515"
-color menufg		"#e8e8d3"
-color menubg		"#151515"
-color activeborder	"#cf6a4c"
-#color activeborder	"#e8e8d3"
-color inactiveborder	"#888888"
+fontname "ttyp0:size=10"
+color font		"#ffebeb"
+color selfont		"#0d0909"
+color menufg		"#ffebeb"
+color menubg		"#0d0909"
+color activeborder	"#6d878d"
+color inactiveborder	"#ad9191"
 
 unbind-key all
 
@@ -37,10 +38,10 @@ bind-key M-1	group-only-1
 bind-key M-2	group-only-2
 bind-key M-3	group-only-3
 bind-key M-4	group-only-4
-bind-key MS-1	window-movetogroup-1
-bind-key MS-2	window-movetogroup-2
-bind-key MS-3	window-movetogroup-3
-bind-key MS-4	window-movetogroup-4
+bind-key CM-1	window-movetogroup-1
+bind-key CM-2	window-movetogroup-2
+bind-key CM-3	window-movetogroup-3
+bind-key CM-4	window-movetogroup-4
 
 unbind-mouse all
 
diff --git a/.gitconfig b/.gitconfig
deleted file mode 100644
index f16455f..0000000
--- a/.gitconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-[commit]
-	gpgsign = true
-[init]
-	defaultBranch = trunk
-[user]
-	name = Agnosto Dvonik
-	email = dvonik@rslp.org
-	signingkey = 231E067D4E995977D82EAAF02E71AADAE25FA0EE
diff --git a/.local/bin/bar b/.local/bin/bar
index a7f6ebc..08a3ae8 100755
--- a/.local/bin/bar
+++ b/.local/bin/bar
@@ -5,7 +5,6 @@ sleep=1
 used() {
 	used=$(vmstat | awk 'END {printf $3}' | tr -d "M")
 	full=$(expr $(sysctl -n hw.usermem) / 1048576)
-
 	echo "$used/$full"
 }
 
@@ -21,6 +20,6 @@ chkinet() {
 }
 
 while true; do
-	echo "%{r}$USER@$(hostname) - $(date "+%Y-%m-%d %H:%M %Z") - $(chkinet) - $(used) - $(apm -l)%  "
+	echo  "%{c}%{F#6d878d}%{T2}λ%{T1}%{F#ffebeb} $(hostname) | $(date "+%H:%M %Y/%m/%d") - $(chkinet) - $(used) - $(apm -l)%"
 	sleep $sleep
 done
diff --git a/.profile b/.profile
index 5ab6dff..c5dec3b 100644
--- a/.profile
+++ b/.profile
@@ -3,16 +3,15 @@
 # sh/ksh initialization
 
 MYBIN="$HOME/.local/bin"
-EDITOR="nvim"
+EDITOR="vi"
 HISTFILE="$HOME/.history"
 HISTSIZE=64
 GOPATH="$HOME/.local/share/go"
-PS1="\W \033[1;34mλ\033[0m "
+
 PATH=$MYBIN:$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
 export PATH HOME TERM MYBIN EDITOR HISTFILE HISTSIZE GOPATH PS1
 
 alias mkdir="mkdir -p"
-alias vi="nvim"
 
 set -o vi
 
diff --git a/.xsession b/.xsession
index 4fc635b..99a57cb 100644
--- a/.xsession
+++ b/.xsession
@@ -6,16 +6,15 @@ export DBUS_SESSION_BUS_ADDRESS="no"
 export WALLPAPERS="$HOME/Pictures/Wallpapers"
 
 xrdb -merge "$HOME/.Xdefaults"
-xidle -program "/usr/local/bin/slock" -timeout 600 &
+xidle -sw -program "/usr/sbin/zzz" -timeout 600 &
 xset b 0 0 0
-picom -b
-hsetroot -cover "$WALLPAPERS/mount.png"
-"$HOME/.local/bin/bar" |\
-lemonbar-xft -B "#151515" -F "#e8e8d3" -f "ttyp0:size=9" -g x20 &
-sct 5000
-setxkbmap us altgr-intl
-cwm
+hsetroot -cover "$WALLPAPERS/lain.png"
 
-pkill xidle
-pkill picom
-rm -rf "$HOME/TorBrowser-Data"
+"$HOME/.local/bin/bar" |\
+lemonbar-xft -F "#ffebeb" -B "#0d0909" -f "ttyp0:size=10" -f "ttyp0:size=10:bold" -g x20 &
+
+sct 5500
+setxkbmap us altgr-intl
+setxkbmap -option caps:escape
+
+exec cwm
diff --git a/Pictures/Wallpapers/catswall.png b/Pictures/Wallpapers/catswall.png
deleted file mode 100644
index 6a8f57f..0000000
Binary files a/Pictures/Wallpapers/catswall.png and /dev/null differ
diff --git a/Pictures/Wallpapers/lain.png b/Pictures/Wallpapers/lain.png
new file mode 100644
index 0000000..b231bf8
Binary files /dev/null and b/Pictures/Wallpapers/lain.png differ
diff --git a/README b/README
index c26803f..3757701 100644
--- a/README
+++ b/README
@@ -1,7 +1,6 @@
 dotfiles
 --------
 
-- nvim(1)
 - zathura(1)
 - cwm(1)
 - git(1)
diff --git a/fsroot/etc/X11/xenodm/Xresources b/fsroot/etc/X11/xenodm/Xresources
index c51b35c..8b0e89e 100644
--- a/fsroot/etc/X11/xenodm/Xresources
+++ b/fsroot/etc/X11/xenodm/Xresources
@@ -1,10 +1,10 @@
 ! $OpenBSD: Xresources.in,v 1.4 2022/11/07 17:12:06 matthieu Exp $
 
-Xft.dpi: 120
+Xft.dpi: 96
 
 xlogin*borderWidth:	0	
 xlogin.Login.height:     180
-xlogin.Login.width:      200
+xlogin.Login.width:      180
 xlogin.Login.y:          60
 xlogin.Login.x:          60
 xlogin.Login.frameWidth: 6
@@ -12,15 +12,15 @@ xlogin.Login.innerFramesWidth: 0
 xlogin.Login.sepWidthz:	0
 xlogin.Login.greeting: CLIENTHOST
 xlogin.Login.fail: wrong
-xlogin.Login.background:  #151515
-xlogin.Login.foreground:  #e8e8d3
-xlogin.Login.greetColor:  #e8e8d3
-xlogin.Login.failColor:   #902020
-xlogin.Login.inpColor:    #151515
-xlogin.Login.promptColor: #e8e8d3
-xlogin.Login.hiColor:     #cf6a4c
-xlogin.Login.shdColor:    #cf6a4c
-xlogin.Login.greetFace:		ttyp0-9
-xlogin.Login.face:		ttyp0-9
-xlogin.Login.failFace:		ttyp0-9
-xlogin.Login.promptFace:	ttyp0-9
+xlogin.Login.background:  #0d0909
+xlogin.Login.foreground:  #ffebeb
+xlogin.Login.greetColor:  #ffebeb
+xlogin.Login.failColor:   #ffebeb
+xlogin.Login.inpColor:    #0d0909
+xlogin.Login.promptColor: #ffebeb
+xlogin.Login.hiColor:     #6d878d
+xlogin.Login.shdColor:    #6d878d
+xlogin.Login.greetFace:		ttyp0-10
+xlogin.Login.face:		ttyp0-10
+xlogin.Login.failFace:		ttyp0-10
+xlogin.Login.promptFace:	ttyp0-10
diff --git a/fsroot/etc/X11/xenodm/Xsetup_0 b/fsroot/etc/X11/xenodm/Xsetup_0
index 7f22eff..32606f3 100755
--- a/fsroot/etc/X11/xenodm/Xsetup_0
+++ b/fsroot/etc/X11/xenodm/Xsetup_0
@@ -5,7 +5,7 @@ prefix="/usr/X11R6"
 exec_prefix="${prefix}"
 
 # ${exec_prefix}/bin/xsetroot -fg \#6f6f6f -bg \#bfbfbf -bitmap ${prefix}/include/X11/bitmaps/root_weave
-${exec_prefix}/bin/xsetroot -solid \#151515
+${exec_prefix}/bin/xsetroot -solid \#ffebeb
 
 # ${exec_prefix}/bin/xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
 
diff --git a/fsroot/etc/apm/suspend b/fsroot/etc/apm/suspend
index de6585d..9676174 100755
--- a/fsroot/etc/apm/suspend
+++ b/fsroot/etc/apm/suspend
@@ -1,3 +1,9 @@
 #!/bin/sh
 
-pkill -USR1 xidle 
+# pkill -USR1 xidle 
+
+# Get the current Xsession user
+_user=$(ps -o user= -p $(pgrep -f Xsession))
+pkill xlock
+# Run xlock as the Xsession user
+doas -u $_user env DISPLAY=:0 XAUTHORITY=/home/$_user/.Xauthority slock &
diff --git a/fsroot/etc/rc.conf.local b/fsroot/etc/rc.conf.local
index 108e266..3a01660 100644
--- a/fsroot/etc/rc.conf.local
+++ b/fsroot/etc/rc.conf.local
@@ -1,6 +1,6 @@
 apmd_flags=-LZ5
-obsdfreqd_flags=-T50 -m70
-pkg_scripts=obsdfreqd
+obsdfreqd_flags=-T45
+pkg_scripts=wpa_supplicant obsdfreqd
 smtpd_flags=NO
 sshd_flags=NO
 xenodm_flags=