diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index b394a9fc..4b2532ff 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -51,7 +51,7 @@ syncthing -no-browser &				# File synchronization daemon
 i3lock -i "~/.i3splash" &
 
 ## bspwm GENERAL CONFIGURATION
-bspc monitor -d			web music terminal files V VI VII VIII IX touchy
+bspc monitor -d			web music terminal files V VI VII VIII mail touchy
 
 bspc config border_width	2
 bspc config window_gap		4
@@ -60,6 +60,8 @@ bspc config split_ratio		0.52
 bspc config borderless_monocle	true
 bspc config gapless_monocle	true
 bspc focus_follows_pointer	true
+bspc pointer_follows_focus	true
+bspc pointer_follows_monitor	true
 
 bspc config active_border_color			"#8ec07c"
 bspc config focused_border_color		"#689d6a"
@@ -68,5 +70,7 @@ bspc config normal_border_color			"#1d2021"
 bspc config urgent_border_color			"#fabd2f"
 
 ## bspwm WINDOW RULES
-bspc rule -a Firefox desktop=^0
+bspc rule -a Firefox desktop=web
+bspc rule -a Spotify desktop=music
+bspc rule -a Thunderbird desktop=mail
 
diff --git a/.config/polybar/config b/.config/polybar/config
index a457f72d..2b82ae3b 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -215,7 +215,9 @@ ws-icon-1 = music;
 ; Terminal
 ws-icon-2 = terminal;
 ; Folder
-ws-icon-3 = files; 
+ws-icon-3 = files; 
+; Envelope
+ws-icon-8 = mail; 
 ; Erlenmeyer flask
 ws-icon-9 = touchy; 
 ; Monitor