diff --git a/.cwmrc b/.cwmrc
index e5441c4..382b1e1 100644
--- a/.cwmrc
+++ b/.cwmrc
@@ -1,27 +1,24 @@
-fontname "Inconsolata:size=12"
+fontname "GohuFont:size=9"
 
 ignore bar
 autogroup 0 bar
 sticky yes
 
-borderwidth 3
+borderwidth 4
 
-color font		"#d3c6aa"
-color selfont		"#272e33"
-color menufg		"#d3c6aa"
-color menubg		"#272e33"
-color activeborder	"#495156"
-color inactiveborder	"#374145"
+command firefox	firefox
+command tor	tor-browser
+command zathura	zathura
+command logout	"pkill cwm"
+command lockout	slock
+command suspend	zzz
 
-command lock		slock
-
-command Terminal	xterm
-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"
+color selfont		"#e8e8d4"
+color font		"#141414"
+color menubg		"#e8e8d4"
+color menufg		"#141414"
+color activeborder	"#cf6a4c"
+color inactiveborder	"#3b3b3b"
 
 unbind-key M-h
 unbind-key M-j
@@ -29,12 +26,13 @@ unbind-key M-k
 unbind-key M-l
 
 bind-key 4S-Return	terminal
-bind-key 4S-b		"firefox -P default-default"
-bind-key 4S-s		".local/bin/ss"
+bind-key 4S-b		firefox
+bind-key 4S-t		tor-browser
 bind-key 4S-Tab		lock
 
 bind-key MS-r	restart
 bind-key MS-q	quit
+bind-key MS-s	zzz
 
 bind-key CM-h	window-hide
 bind-key CM-k	window-cycle
@@ -46,10 +44,12 @@ bind-key CM-f	window-fullscreen
 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 SM-1	window-movetogroup-1
 bind-key SM-2	window-movetogroup-2
 bind-key SM-3	window-movetogroup-3
+bind-key SM-4	window-movetogroup-4
 
 bind-mouse 4-1	window-move
 bind-mouse 4-2	window-lower