diff --git a/.config/i3/config.laptop b/.config/i3/config.laptop
index 91d4edf..b21e91b 100644
--- a/.config/i3/config.laptop
+++ b/.config/i3/config.laptop
@@ -125,12 +125,6 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-#put workspace 1 on main screen
-workspace 1 output DVI-D-0
-workspace 2 output HDMI-0 
-workspace 3 output DVI-D-0
-workspace 4 output HDMI-0 
-
 #start compositor
 exec --no-startup-id compton
 
@@ -198,10 +192,18 @@ exec --no-startup-id redshift-gtk
 # Set ALSA initial volume
 exec-always --no-startup-id amixer -D hw:PCH -M sset Master 50%
 exec --no-startup-id pavucontrol
+exec standardnotes-desktop
+exec atom
 
-for_window [class="^Thunderbird*"] move container to workspace 3
+for_window [class="^Thunderbird*"] move scratchpad
+bindsym $mod+Shift+t [class="^Thunderbird*"] scratchpad show
 for_window [class="^Signa*"] move scratchpad
 bindsym $mod+Shift+s [class="^Signa*"] scratchpad show
+for_window [class="^Pavucontrol"] move scratchpad
+bindsym $mod+Shift+p [class="^Pavucontrol"] move scratchpad
+for_window [class="Atom"] move to workspace 2
+for_window [class="Tor Browser"] move to workspace 5
+for_window [class="Standard Notes"] move to workspace 4
 
 # Automate port mapping for applications
 exec --no-startup-id jack-matchmaker -p ~/.config/jack-matchmaker/patterns
@@ -218,4 +220,3 @@ exec signal-desktop
 bindsym $mod+Print exec ~/.config/i3/scripts/screenshot.py -s
 # Upload to Lychee
 bindsym Print exec ~/.config/i3/scripts/screenshot.py -u
-for_window [class="^Pavucontrol"] move container to workspace 4
diff --git a/.config/polybar/config.laptop b/.config/polybar/config.laptop
index 2057479..a5b344c 100644
--- a/.config/polybar/config.laptop
+++ b/.config/polybar/config.laptop
@@ -52,7 +52,7 @@ module-margin-right = 4
 
 modules-left = powermenu system-uptime-pretty battery
 modules-center = xwindow
-modules-right = system-usb-udev pulseaudio date 
+modules-right = system-usb-udev pulseaudio date
 
 tray-position = right
 
@@ -78,7 +78,7 @@ font-3 = MaterialIcons-Regular:size=11;4
 font-4 = Font Awesome 5 Free:style=solid:size=10;2
 
 modules-left = i3
-;modules-center = 
+;modules-center =
 modules-right = wireless-network wired-network updates-arch-combined temperature cpu memory filesystem-custom
 
 [module/pulseaudio]
@@ -128,12 +128,11 @@ format = <label-state> <label-mode>
 
 index-sort = true
 
-ws-icon-0 = 2;
-ws-icon-1 = 1;
-ws-icon-2 = 3;
-ws-icon-3 = 4;
-ws-icon-4 = irssi;
-ws-icon-default = 
+ws-icon-0 = 2;
+ws-icon-1 = 1;
+ws-icon-2 = 3;
+ws-icon-3 = 4;
+ws-icon-4 = 5;
 
 label-dimmed-underline = ${root.background}
 
@@ -237,7 +236,7 @@ bar-used-foreground-0 = #55aa55
 bar-used-foreground-1 = #557755
 bar-used-foreground-2 = #f5a70a
 bar-used-foreground-3 = #ff5555
-bar-used-indicator = 
+bar-used-indicator =
 bar-used-indicator-font = 2
 bar-used-indicator-foreground = #fff
 bar-used-fill =▐
@@ -269,9 +268,9 @@ label = %{F#77dd77} %{F-} %temperature-c%
 label-warn = %{F#dd7777}  %{F-} %temperature-c%
 label-warn-foreground = #dd7777
 
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
+ramp-0 =
+ramp-1 =
+ramp-2 =
 ramp-foreground = ${colors.foreground-alt}
 
 [module/powermenu]