diff --git a/.Xdefaults b/.Xdefaults
index deb0db1..e0507e9 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -2,45 +2,54 @@
 
 Xft.hinting: true
 Xft.hintstyle: hintfull
+Xft.dpi: 123
 
 XTerm.termName: xterm-256color
 XTerm*loginShell:true
-XTerm*font: xft:GohuFont:size=9
+XTerm*font: xft:Tamsyn:size=8
+XTerm*scaleHeight: 1.05
 XTerm*scrollBar:false
 XTerm*utf8:true
 XTerm*eightBitInput: true
-XTerm*internalBorder: 8
+XTerm*internalBorder: 12
 
 XTerm.vt100.translations: #override \n\
 	Ctrl Shift <Key>C: copy-selection(CLIPBOARD) \n\
 	Ctrl Shift <Key>V: insert-selection(CLIPBOARD)
 
-Nsxiv.bar.font: GohuFont:size=9
+*foreground: #cdd6f4
+*background: #1e1e2e
+*fading: 0
+*cursorColor: #f38ba8
 
-*.foreground:   #e8e8d4
-*.background:   #141414
-*.cursorColor:  #ffa560
+! black
+*color0: #45475a
+*color8: #585b70
 
-*.color0:	#3b3b3b
-*.color8:	#929292
+! red
+*color1: #f38ba8
+*color9: #f38ba8
 
-*.color1:	#cf6a4c
-*.color9:	#e27373
+! green
+*color2: #a6e3a1
+*color10: #a6e3a1
 
-*.color2:	#99ad6a
-*.color10:	#aecc66
+! yellow
+*color3: #f9e2af
+*color11: #f9e2af
 
-*.color3:	#d8ad4c
-*.color11:	#ffba7b
+! blue
+*color4: #89b4fa
+*color12: #89b4fa
 
-*.color4:	#597bc5
-*.color12:	#729af2
+! magenta
+*color5: #f5c2e7
+*color13: #f5c2e7
 
-*.color5:	#a037b0
-*.color13:	#c051d1
+! cyan
+*color6: #94e2d5
+*color14: #94e2d5
 
-*.color6:	#71b9f8
-*.color14:	#99cefc
-
-*.color7:	#c9c9bd
-*.color15:	#e8e8d4
+! white
+*color7: #bac2de
+*color15: #a6adc8
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index d6b19ea..d719bb4 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -5,8 +5,39 @@ set move	= no
 set imap_keepalive	= 900
 set status_format=""
 
-color normal	default	default
-color status	default	black
-color signature	red	default
-
 source "~/.config/mutt/acct.main"
+
+color normal		  default default         # Text is "Text"
+color index		    color2 default ~N       # New Messages are Green
+color index		    color1 default ~F       # Flagged messages are Red
+color index		    color13 default ~T      # Tagged Messages are Red
+color index		    color1 default ~D       # Messages to delete are Red
+color attachment	color5 default          # Attachments are Pink
+color signature	  color8 default          # Signatures are Surface 2
+color search		  color4 default          # Highlighted results are Blue
+
+color indicator		default color8          # currently highlighted message Surface 2=Background Text=Foreground
+color error		    color1 default          # error messages are Red
+color status		  color15 default         # status line "Subtext 0"
+color tree        color15 default         # thread tree arrows Subtext 0
+color tilde       color15 default         # blank line padding Subtext 0
+
+color hdrdefault  color13 default         # default headers Pink
+color header		  color13 default "^From:"
+color header	 	  color13 default "^Subject:"
+
+color quoted		  color15 default         # Subtext 0
+color quoted1		  color7 default          # Subtext 1
+color quoted2		  color8 default          # Surface 2
+color quoted3		  color0 default          # Surface 1
+color quoted4		  color0 default
+color quoted5		  color0 default
+
+color body		color2 default		[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+               # email addresses Green
+color body	  color2 default		(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+        # URLs Green
+color body		color4 default		(^|[[:space:]])\\*[^[:space:]]+\\*([[:space:]]|$) # *bold* text Blue
+color body		color4 default		(^|[[:space:]])_[^[:space:]]+_([[:space:]]|$)     # _underlined_ text Blue
+color body		color4 default		(^|[[:space:]])/[^[:space:]]+/([[:space:]]|$)     # /italic/ text Blue
+
+color sidebar_flagged   color1 default    # Mailboxes with flagged mails are Red
+color sidebar_new       color10 default   # Mailboxes with new mail are Green
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
new file mode 100644
index 0000000..6b9841d
--- /dev/null
+++ b/.config/nvim/init.vim
@@ -0,0 +1,11 @@
+filetype plugin on
+syntax on
+set termguicolors
+set ai
+set nu
+set ic
+set hlsearch
+set noshowmode
+set laststatus=0
+set cursorline
+colo catppuccin-mocha
diff --git a/.config/picom.conf b/.config/picom.conf
new file mode 100644
index 0000000..d2bf3fb
--- /dev/null
+++ b/.config/picom.conf
@@ -0,0 +1,15 @@
+# backend = "glx";
+vsync = true;
+# shadow = true;
+# shadow-radius = 1; 
+# shadow-opacity = 0.45;
+# shadow-offset-x = 6;
+# shadow-offset-y = 6;
+# shadow-exclude = [
+# 	"class_g = 'Bar'",
+# ];
+fading = true;
+fade-delta = 3;
+xrender-sync-fence = true;
+# glx-no-rebind-pixmap = true;
+# glx-no-stencil = true;
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index 8b180b8..3329909 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -1,20 +1,20 @@
-set font "GohuFont normal 9"
-set default-bg			"#e8e8d4"
-set default-fg			"#141414"
-set index-bg			"#e8e8d4"
-set index-fg			"#141414"
-set index-active-bg		"#e8e8d4"
-set index-active-fg		"#141414"
-set inputbar-bg			"#e8e8d4"
-set inputbar-fg			"#141414"
-set statusbar-bg		"#e8e8d4"
-set statusbar-fg		"#141414"
-set highlight-color		"#e8e8d4"
-set highlight-active-color	"#141414"
-set recolor-lightcolor		"#e8e8d4"
-set recolor-darkcolor		"#141414"
+set font "Tamsyn normal 8"
+set default-bg			"#1e1e2d"
+set default-fg			"#cdd6f4"
+set index-bg			"#1e1e2d"
+set index-fg			"#cdd6f4"
+set index-active-bg		"#1e1e2d"
+set index-active-fg		"#cdd6f4"
+set inputbar-bg			"#1e1e2d"
+set inputbar-fg			"#cdd6f4"
+set statusbar-bg		"#1e1e2d"
+set statusbar-fg		"#cdd6f4"
+set highlight-color		"#1e1e2d"
+set highlight-active-color	"#cdd6f4"
+set recolor-lightcolor		"#1e1e2d"
+set recolor-darkcolor		"#cdd6f4"
 
-set adjust-open		"width"
+#set adjust-open		"width"
 set pages-per-row	1
 set scroll-page-aware	"true"
 set scroll-full-overlap	0.01
diff --git a/.cwmrc b/.cwmrc
index c11271b..1414cda 100644
--- a/.cwmrc
+++ b/.cwmrc
@@ -1,17 +1,19 @@
-fontname "GohuFont:size=9"
+fontname "Tamsyn:size=8"
+
+gap 30 0 0 0
 
 ignore bar
 autogroup 0 bar
 sticky yes
 
-borderwidth 4
+borderwidth 6
 
-color selfont		"#e8e8d4"
-color font		"#141414"
-color menubg		"#e8e8d4"
-color menufg		"#141414"
-color activeborder	"#cf6a4c"
-color inactiveborder	"#3b3b3b"
+color selfont		"#1e1e2e"
+color font		"#cdd6f4"
+color menubg		"#1e1e2e"
+color menufg		"#cdd6f4"
+color activeborder	"#a6adc8"
+color inactiveborder	"#45475a"
 
 unbind-key all
 
@@ -20,10 +22,18 @@ unbind-key M-j
 unbind-key M-k
 unbind-key M-l
 
+command terminal xterm 
+command browse	"firefox -P main"
+command school	"firefox -P school"
+command tor	tor-browser
+command confuse	slock
+command suspend zzz
+
 bind-key 4S-Return	terminal
-bind-key 4S-b		".local/bin/chrome"
+bind-key 4S-b		"firefox -P main"
+bind-key 4S-s		"firefox -P school"
 bind-key 4S-t		tor-browser
-bind-key 4S-Tab		lock
+bind-key 4S-Tab		slock
 
 bind-key MS-r	restart
 bind-key MS-q	quit
@@ -46,8 +56,6 @@ bind-key SM-2	window-movetogroup-2
 bind-key SM-3	window-movetogroup-3
 bind-key SM-4	window-movetogroup-4
 
-unbind-mouse	all
-
 bind-mouse 4-1	window-move
 bind-mouse 4-2	window-lower
 bind-mouse 4-3	window-resize
diff --git a/.xsession b/.xsession
index ddd2510..f8a2f9a 100644
--- a/.xsession
+++ b/.xsession
@@ -3,24 +3,20 @@
 export LANG="en_US.UTF-8"
 export DBUS_SESSION_BUS_ADDRESS="no"
 export GTK_THEME="Adwaita:dark"
-# export XMODIFIERS=@im=ibus
-# export GTK_IM_MODULE=ibus
-# export QT_IM_MODULE=ibus
 
 walldir="$HOME/Pictures/Wallpapers"
 
-xrdb -merge "$HOME/.Xdefaults"
-sct 5500
+xset b off
+# xrdb -merge "$HOME/.Xdefaults"
+sct 4250
+picom &
 
-# pick one
-feh --no-fehbg --bg-fill "$walldir/catswall.png" &
-# xsetroot -solid "#e8e8d4" &
+feh --no-fehbg --bg-fill "$walldir/city.png"
 
-xidle -program "/usr/sbin/zzz" -timeout 590 &
+xidle -program "/usr/local/bin/slock" -timeout 600 &
 
 "$HOME/.local/bin/bar" |\
-lemonbar-xft -f "GohuFont:size=9" -B "#e8e8d4" -F "#141414" -g x30 &
+lemonbar-xft -f "Tamsyn:size=8:style=Bold" -F "#cdd6f4" -g x30 &
 
-# in the case japanese is required
-# ibus-daemon -x &
+setxkbmap us altgr-intl
 cwm
diff --git a/fsroot/etc/X11/xenodm/Xresources b/fsroot/etc/X11/xenodm/Xresources
index b97d470..c02997b 100644
--- a/fsroot/etc/X11/xenodm/Xresources
+++ b/fsroot/etc/X11/xenodm/Xresources
@@ -1,24 +1,26 @@
 ! $OpenBSD: Xresources.in,v 1.4 2022/11/07 17:12:06 matthieu Exp $
 
+Xft.dpi: 123
+
 xlogin*borderWidth:	0	
-xlogin.Login.height:     140
+xlogin.Login.height:     160
 xlogin.Login.width:      200
 xlogin.Login.y:          60
 xlogin.Login.x:          60
-xlogin.Login.frameWidth: 4
+xlogin.Login.frameWidth: 6
 xlogin.Login.innerFramesWidth: 0
 xlogin.Login.sepWidthz:	0
 xlogin.Login.greeting: CLIENTHOST
 xlogin.Login.fail: ya dun goofed
-xlogin.Login.background:  #141414
-xlogin.Login.foreground:  #e8e8d4
-xlogin.Login.greetColor:  #e8e8d4
-xlogin.Login.failColor:   #cf6a4c
-xlogin.Login.inpColor:    #141414
-xlogin.Login.promptColor: #e8e8d4
-xlogin.Login.hiColor:     #cf6a4c
-xlogin.Login.shdColor:    #cf6a4c
-xlogin.Login.greetFace:		GohuFont-10
-xlogin.Login.face:		GohuFont-9
-xlogin.Login.failFace:		GohuFont-9
-xlogin.Login.promptFace:	GohuFont-9
+xlogin.Login.background:  #1e1e2e
+xlogin.Login.foreground:  #cdd6f4
+xlogin.Login.greetColor:  #cdd6f4
+xlogin.Login.failColor:   #f38ba8
+xlogin.Login.inpColor:    #1e1e2e
+xlogin.Login.promptColor: #cdd6f4
+xlogin.Login.hiColor:     #a6adc8
+xlogin.Login.shdColor:    #a6adc8
+xlogin.Login.greetFace:		Tamsyn-8
+xlogin.Login.face:		Tamsyn-8
+xlogin.Login.failFace:		Tamsyn-8
+xlogin.Login.promptFace:	Tamsyn-8
diff --git a/fsroot/etc/X11/xenodm/Xsetup_0 b/fsroot/etc/X11/xenodm/Xsetup_0
index 08da77e..5330947 100755
--- a/fsroot/etc/X11/xenodm/Xsetup_0
+++ b/fsroot/etc/X11/xenodm/Xsetup_0
@@ -1,14 +1,7 @@
 #!/bin/sh
 # $OpenBSD: Xsetup_0.in,v 1.1 2021/08/30 15:38:27 matthieu Exp $
 
-/usr/X11R6/bin/setxkbmap jp OADG109A -model thinkpad60
 /usr/X11R6/bin/xset b off
-/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" 10
-/usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "Device Accel Constant Deceleration" 0.5
+/usr/X11R6/bin/xinput set-prop "/dev/wsmouse0" "Device Accel Constant Deceleration" 0.4
 /usr/X11R6/bin/xrandr --dpi 96
-/usr/X11R6/bin/xsetroot -solid \#e8e8d4
-/usr/local/bin/feh -B \#e8e8d4 -g 213x64+1130+680 -. \
-	-Z /etc/X11/xenodm/pixmaps/digital.png &
+/usr/X11R6/bin/xsetroot -solid \#11111d
diff --git a/fsroot/etc/X11/xorg.conf b/fsroot/etc/X11/xorg.conf
index c723c3a..4f42827 100644
--- a/fsroot/etc/X11/xorg.conf
+++ b/fsroot/etc/X11/xorg.conf
@@ -1,8 +1,3 @@
-Section "Device"
-	Identifier "Intel Graphics"
-	Driver "intel"
-EndSection
-
 Section "ServerFlags"
 	Option "DontVTSwitch"	"True"
 	Option "DontZap"	"True"
diff --git a/fsroot/etc/apm/suspend b/fsroot/etc/apm/suspend
index 3cd9e46..de6585d 100755
--- a/fsroot/etc/apm/suspend
+++ b/fsroot/etc/apm/suspend
@@ -1,7 +1,3 @@
 #!/bin/sh
 
-# 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 &
+pkill -USR1 xidle 
diff --git a/fsroot/etc/rc.conf.local b/fsroot/etc/rc.conf.local
index ada696d..d98dee7 100644
--- a/fsroot/etc/rc.conf.local
+++ b/fsroot/etc/rc.conf.local
@@ -1,5 +1,6 @@
+#obsdfreqd_flags=-r6 -m75 -T40
 apmd_flags=-L
-obsdfreqd_flags=-m85 -T45
+obsdfreqd_flags=-T40
 pkg_scripts=obsdfreqd
 smtpd_flags=NO
 sshd_flags=NO
diff --git a/fsroot/etc/sysctl.conf b/fsroot/etc/sysctl.conf
index 94b5d28..f788aa1 100644
--- a/fsroot/etc/sysctl.conf
+++ b/fsroot/etc/sysctl.conf
@@ -1 +1,13 @@
-kern.bufcachepercent=50
+# Enable hyperthreading
+# hw.smt=1
+
+# default: 1310
+kern.maxproc=8192
+# default: 7030
+kern.maxfiles=32768
+# default: 1950
+kern.maxthread=16384
+# shared memory settings
+kern.shminfo.shmall=536870912    # default: 8192
+kern.shminfo.shmmax=2147483647   # default: 33554432
+kern.shminfo.shmmni=4096         # default: 1024