diff --git a/.Xdefaults b/.Xdefaults
index 666ad1d..b0a6212 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -5,52 +5,49 @@ Xft.hintstyle: hintfull
 
 XTerm.termName: xterm-256color
 XTerm*loginShell:true
-XTerm*font: xft:Source Code Pro:size=11.5
+XTerm*font: xft:Inconsolata:size=12
 XTerm*scrollBar:false
 XTerm*utf8:true
 XTerm*eightBitInput: true
 XTerm*internalBorder: 8
-XTerm*allowMouseOps:true
 
 XTerm.vt100.translations: #override \n\
 	Ctrl Shift <Key>C: copy-selection(CLIPBOARD) \n\
 	Ctrl Shift <Key>V: insert-selection(CLIPBOARD)
 
-nsxiv.window.background: #000
-nsxiv.window.foreground: #fff
-nsxiv.bar.font: xft:Source Code Pro:size=11.5
-
-*background: #000
-*foreground: #fff
+! special
+*.foreground:   #d3c6aa
+*.background:   #272e33
+*.cursorColor:  #d3c6aa
 
 ! black
-*color0: #000
-*color8: #353535
+*.color0:       #272e33
+*.color8:       #374145
 
 ! red
-*color1: #f92672
-*color9: #f92672
+*.color1:       #f85552
+*.color9:       #e67e80
 
 ! green
-*color2: #a6e22e
-*color10: #a6e22e
+*.color2:       #8da101
+*.color10:      #a7c080
 
 ! yellow
-*color3: #f4bf75
-*color11: #f4bf75
+*.color3:       #dfa000
+*.color11:      #dbbc7f
 
 ! blue
-*color4: #66d9ef
-*color12: #66d9ef
+*.color4:       #3a94c5
+*.color12:      #7fbbb3
 
 ! magenta
-*color5: #ae81ff
-*color13: #ae81ff
+*.color5:       #df69ba
+*.color13:      #d699b6
 
 ! cyan
-*color6: #a1efe4
-*color14: #a1efe4
+*.color6:       #35a77c
+*.color14:      #83c092
 
 ! white
-*color7: #fff
-*color15: #ff
+*.color7:       #bec5b2
+*.color15:      #edeada
diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf
index fdfe39f..9ef6c2c 100644
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@@ -1,2 +1 @@
-geometry=200x200+1695+810
 audio-pitch-correction=no
diff --git a/.mutt/muttrc b/.config/mutt/muttrc
similarity index 100%
rename from .mutt/muttrc
rename to .config/mutt/muttrc
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index 6c732cc..dfd8f55 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -1,17 +1,18 @@
-set default-bg			"#000"
-set default-fg			"#fff"
-set index-bg			"#000"
-set index-fg			"#fff"
-set index-active-bg		"#000"
-set index-active-fg		"#fff"
-set inputbar-bg			"#000"
-set inputbar-fg			"#fff"
-set statusbar-bg		"#000"
-set statusbar-fg		"#fff"
-set highlight-color		"#000"
-set highlight-active-color	"#fff"
-set recolor-lightcolor		"#000"
-set recolor-darkcolor		"#fff"
+set font "Anonymous Pro normal 12"
+set default-bg			"#272e33"
+set default-fg			"#d3c6aa"
+set index-bg			"#272e33"
+set index-fg			"#d3c6aa"
+set index-active-bg		"#272e33"
+set index-active-fg		"#d3c6aa"
+set inputbar-bg			"#272e33"
+set inputbar-fg			"#d3c6aa"
+set statusbar-bg		"#272e33"
+set statusbar-fg		"#d3c6aa"
+set highlight-color		"#272e33"
+set highlight-active-color	"#d3c6aa"
+set recolor-lightcolor		"#272e33"
+set recolor-darkcolor		"#d3c6aa"
 
 set adjust-open		"best-fit"
 set pages-per-row	1
@@ -19,7 +20,6 @@ set scroll-page-aware	"true"
 set scroll-full-overlap	0.01
 set scroll-step		100
 
-set font	"Source Code Pro 11.5"
 set recolor	true
 set guioptions	none
 set page-padding 1
diff --git a/.cwmrc b/.cwmrc
index 86af4b0..e5441c4 100644
--- a/.cwmrc
+++ b/.cwmrc
@@ -1,26 +1,26 @@
-fontname "Source Code Pro:size=11.5"
+fontname "Inconsolata:size=12"
 
 ignore bar
 autogroup 0 bar
-
 sticky yes
 
-borderwidth 2 
+borderwidth 3
 
-color font		"#fff"
-color selfont		"#000"
-color menufg		"#fff"
-color menubg		"#000"
-color activeborder	"#fff"
-color inactiveborder	"#353535"
+color font		"#d3c6aa"
+color selfont		"#272e33"
+color menufg		"#d3c6aa"
+color menubg		"#272e33"
+color activeborder	"#495156"
+color inactiveborder	"#374145"
 
 command lock		slock
 
 command Terminal	xterm
-command Browser		bin/uc
-command Discord		bin/discord
-command Screenshot	bin/ss
-command Lock		slock
+command Browser		"firefox -P default-default"
+command "School Browser" "firefox -P school"
+command "Tor Browser"	tor-browser
+command Screenshot	".local/bin/ss"
+command Lock		lock
 command Logout		"pkill cwm"
 
 unbind-key M-h
@@ -28,31 +28,28 @@ unbind-key M-j
 unbind-key M-k
 unbind-key M-l
 
-bind-key F4	"actl mute"
-bind-key F5	"actl up"
-bind-key F6	"actl down"
-
 bind-key 4S-Return	terminal
-bind-key 4S-b		bin/uc
-bind-key 4S-s		bin/ss
+bind-key 4S-b		"firefox -P default-default"
+bind-key 4S-s		".local/bin/ss"
 bind-key 4S-Tab		lock
 
 bind-key MS-r	restart
 bind-key MS-q	quit
 
+bind-key CM-h	window-hide
 bind-key CM-k	window-cycle
 bind-key CM-j	window-rcycle
 bind-key CM-w	window-close
 bind-key CM-m	window-maximize
 bind-key CM-f	window-fullscreen
 
-bind-key C-1	group-only-1
-bind-key C-2	group-only-2
-bind-key C-3	group-only-3
+bind-key M-1	group-only-1
+bind-key M-2	group-only-2
+bind-key M-3	group-only-3
 
-bind-key CM-1	window-movetogroup-1
-bind-key CM-2	window-movetogroup-2
-bind-key CM-3	window-movetogroup-3
+bind-key SM-1	window-movetogroup-1
+bind-key SM-2	window-movetogroup-2
+bind-key SM-3	window-movetogroup-3
 
 bind-mouse 4-1	window-move
 bind-mouse 4-2	window-lower
diff --git a/.exrc b/.exrc
index ff2741b..9fdb2b3 100644
--- a/.exrc
+++ b/.exrc
@@ -6,4 +6,3 @@ set report=1
 set ruler
 set searchincr
 set terse
-set verbose
diff --git a/bin/bar b/.local/bin/bar
similarity index 100%
rename from bin/bar
rename to .local/bin/bar
diff --git a/bin/randfile b/.local/bin/randfile
similarity index 100%
rename from bin/randfile
rename to .local/bin/randfile
diff --git a/bin/uc b/.local/bin/uc
similarity index 100%
rename from bin/uc
rename to .local/bin/uc
diff --git a/bin/ufetch b/.local/bin/ufetch
similarity index 100%
rename from bin/ufetch
rename to .local/bin/ufetch
diff --git a/bin/ufetch.LICENSE b/.local/bin/ufetch.LICENSE
similarity index 100%
rename from bin/ufetch.LICENSE
rename to .local/bin/ufetch.LICENSE
diff --git a/.profile b/.profile
index f2ef378..f2a8a09 100644
--- a/.profile
+++ b/.profile
@@ -1,20 +1,18 @@
-# $OpenBSD: dot.profile,v 1.7 2020/01/24 02:09:51 okan Exp $
+# $OpenBSD: dot.profile,v 1.8 2022/08/10 07:40:37 tb Exp $
 #
 # sh/ksh initialization
-#
 
 LANG="en_US.UTF-8"
-EDITOR="vi"
+PATH=$HOME/.local/bin:$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
 HISTFILE="$HOME/.history"
 HISTSIZE=2048
+export PS1 LANG PATH HISTFILE HISTSIZE HOME TERM
 
-# I like /usr/games
-PATH=$HOME/bin:$HOME/.local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin:/usr/games
-export PATH HOME LANG EDITOR HISTFILE HISTSIZE
+export GOT_AUTHOR="Agnosto Dvonik <dvonik@rslp.org>"
 
-[ -e "Desktop" ] && rm -r "Desktop"
-[ -e "Downloads" ] && rm -r "Downloads"
+set -o vi
 
-# fortune
+#/usr/games/fortune
 myfortune
+
 calendar -A0 -B0
diff --git a/.xsession b/.xsession
index 43840fe..d952461 100644
--- a/.xsession
+++ b/.xsession
@@ -1,21 +1,19 @@
-#!/bin/sh
-#
-# dvonik's .xsession
-# public domain
-#
-
-export GTK_THEME=Adwaita:dark
 export LANG="en_US.UTF-8"
 export DBUS_SESSION_BUS_ADDRESS="no"
+export GTK_THEME="Adwaita:dark"
 
+walldir="$HOME/Pictures/Wallpapers"
+
+xset b off
+xrandr --dpi 96
 xrdb -merge "$HOME/.Xdefaults"
-hsetroot -cover "$HOME/share/pic/wall/angad-singh-rHeN0jbxwPs-unsplash.jpg"
-sct 6000
-
-picom -fI0.075 -O0.075 \
---backend glx --glx-no-stencil --glx-no-rebind-pixmap \
---vsync --xrender-sync-fence -b
+sct 5600
+xwallpaper --zoom "$walldir/tobias-tullius-PXXtq6bp6cs-unsplash.jpg"
 xidle -program "/usr/sbin/zzz" -timeout 600 &
-curl -SsLo $HOME/share/misc/wttr "https://wttr.in/?m&format=%t%20%C" &
-"$HOME/bin/bar" | lemonbar-xft -B "#000" -F "#fff" -f "Source Code Pro:size=11.5" -f "Noto Sans CJK JP" &
-exec cwm
+
+picom --backend glx --glx-no-rebind-pixmap --glx-no-stencil --xrender-sync-fence --vsync \
+	-fI0.075 -O0.075 --corner-radius 10 -co50 -r5 -o0.45 -l6 -t6&
+"$HOME/.local/bin/bar" | lemonbar-xft -F "#d3c6aa" -f "Inconsolata:size=12" -g 1920x30+0+1050 &
+
+"$HOME/.local/bin/wttr" &
+cwm
diff --git a/README b/README
index cdb2d6d..fbbd5b3 100644
--- a/README
+++ b/README
@@ -1,16 +1,3 @@
 dotfiles
---------
-* apm
-* cwm
-* hsetroot
-* init
-* ksh
-* lemonbar
-* vi
-* obsdfreqd
-* picom
-* ufetch
-* xdotool
-* xenodm
-* xterm
-* zathura
+
+idk wat
diff --git a/fsroot/etc/X11/xenodm/Xresources b/fsroot/etc/X11/xenodm/Xresources
index ebab0ba..77a4e32 100644
--- a/fsroot/etc/X11/xenodm/Xresources
+++ b/fsroot/etc/X11/xenodm/Xresources
@@ -1,9 +1,4 @@
 ! $OpenBSD: Xresources.in,v 1.4 2022/11/07 17:12:06 matthieu Exp $
-!
-!
-!
-!
-!
 
 ! zakaria.org's fail message is the best, and i cannot possibly replace it
 xlogin.Login.fail: ya dun goofed
@@ -17,14 +12,14 @@ xlogin.Login.frameWidth: 10
 xlogin.Login.innerFramesWidth: 0 
 xlogin.Login.sepWidthz:	0
 
-xlogin.Login.background:  #000
-xlogin.Login.foreground:  #fff
-xlogin.Login.failColor:   #f92672
-xlogin.Login.inpColor:    #000
-xlogin.Login.promptColor: #fff
-xlogin.Login.hiColor:     #000
-xlogin.Login.shdColor:    #000
+xlogin.Login.background:  #272e33
+xlogin.Login.foreground:  #d3c6aa
+xlogin.Login.failColor:   #f85552
+xlogin.Login.inpColor:    #272e33
+xlogin.Login.promptColor: #d3c6aa
+xlogin.Login.hiColor:     #272e33
+xlogin.Login.shdColor:    #272e33
 
-xlogin.Login.face:		Source Code Pro-12
-xlogin.Login.failFace:		Source Code Pro-12
-xlogin.Login.promptFace:	Source Code Pro-12
+xlogin.Login.face:		Inconsolata-12
+xlogin.Login.failFace:		Inconsolata-12
+xlogin.Login.promptFace:	Inconsolata-12
diff --git a/fsroot/etc/X11/xenodm/Xsetup_0 b/fsroot/etc/X11/xenodm/Xsetup_0
index 475cfde..2db664e 100755
--- a/fsroot/etc/X11/xenodm/Xsetup_0
+++ b/fsroot/etc/X11/xenodm/Xsetup_0
@@ -1,10 +1,10 @@
 #!/bin/sh
 # $OpenBSD: Xsetup_0.in,v 1.1 2021/08/30 15:38:27 matthieu Exp $
 
-/usr/X11R6/bin/xsetroot -solid \#000
+/usr/X11R6/bin/xsetroot -solid \#272e33
 /usr/X11R6/bin/xrandr --dpi 96
 /usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1
 /usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Button" 2
 /usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Axes" 6 7 4 5
 /usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Inertia" 1 
-/usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "Device Accel Constant Deceleration" 0.3
+/usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "Device Accel Constant Deceleration" 0.1
diff --git a/fsroot/etc/apm/resume b/fsroot/etc/apm/resume
deleted file mode 100755
index d6f2f5c..0000000
--- a/fsroot/etc/apm/resume
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sync
diff --git a/fsroot/etc/apm/suspend b/fsroot/etc/apm/suspend
index 9d36537..3cd9e46 100755
--- a/fsroot/etc/apm/suspend
+++ b/fsroot/etc/apm/suspend
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-pkill -USR1 xidle
+# Get the current Xsession user
+_user=$(ps -o user= -p $(pgrep -f Xsession))
+pkill slock
+# 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 0a0196e..4ac869d 100644
--- a/fsroot/etc/rc.conf.local
+++ b/fsroot/etc/rc.conf.local
@@ -1,6 +1,7 @@
-apmd_flags=-L
-obsdfreqd_flags=-T50 -t150
+apmd_flags=-H
+obsdfreqd_flags=-T45 -m90
 pkg_scripts=obsdfreqd
 smtpd_flags=NO
 sshd_flags=NO
+unwind_flags=
 xenodm_flags=