diff --git a/laptop/.config/alacritty/alacritty.yml b/laptop/.config/alacritty/alacritty.yml
index 994da53..43faca9 100644
--- a/laptop/.config/alacritty/alacritty.yml
+++ b/laptop/.config/alacritty/alacritty.yml
@@ -72,7 +72,7 @@ font:
     #family: InconsolataLGC Nerd Font Mono
     #style: Bold Italic
 
-  size: 12.0
+  size: 10.0
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
@@ -93,7 +93,6 @@ colors:
   primary:
     background: '0x1e2127'
     foreground: '0xabb2bf'
-
   # Normal colors
   normal:
     black:   '0x1e2127'
@@ -341,11 +340,11 @@ key_bindings:
   - { key: V,        mods: Control|Shift, action: Paste            }
   #- { key: C,        mods: Control|Shift, action: Copy             }
   #- { key: Insert,   mods: Shift,         action: PasteSelection   }
-  #- { key: Key0,     mods: Control,       action: ResetFontSize    }
-  #- { key: Equals,   mods: Control,       action: IncreaseFontSize }
-  #- { key: Add,      mods: Control,       action: IncreaseFontSize }
-  #- { key: Subtract, mods: Control,       action: DecreaseFontSize }
-  #- { key: Minus,    mods: Control,       action: DecreaseFontSize }
+  - { key: Key0,     mods: Control,       action: ResetFontSize    }
+  - { key: Equals,   mods: Control,       action: IncreaseFontSize }
+  - { key: Add,      mods: Control,       action: IncreaseFontSize }
+  - { key: Subtract, mods: Control,       action: DecreaseFontSize }
+  - { key: Minus,    mods: Control,       action: DecreaseFontSize }
 
   # (Windows only)
   #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
diff --git a/laptop/.config/i3/config b/laptop/.config/i3/config
index 0861bbf..a244ae7 100644
--- a/laptop/.config/i3/config
+++ b/laptop/.config/i3/config
@@ -19,7 +19,7 @@ bindsym $mod+Return exec --no-startup-id alacritty
 bindsym $mod+Ctrl+Return exec --no-startup-id xterm
 
 # Leaving
-bindsym $mod+Shift+BackSpace exec "xlock -mode pacman -info ''"
+bindsym $mod+Shift+BackSpace exec "~/scripts/lock.sh"
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Logout?' -B 'Yes!' 'i3-msg exit'"
 
 # Config refresh
@@ -89,7 +89,8 @@ bindsym XF86AudioPrev exec playerctl previous
 mode "Open" {
 	bindsym f exec firefox
 	bindsym s exec spotify
-	bindsym d exec Discord
+	bindsym d exec discord; exec Discord
+	bindsym c exec gsimplecal
 
 	bindsym Escape mode "default"
 	bindsym Return mode "default"
@@ -97,7 +98,7 @@ mode "Open" {
 
 bindsym $mod+o mode "Open"
 
-# ======================================== Open Applications
+# ======================================== Shutdown
 mode "Shutdown" {
 	bindsym s exec shutdown now
 	bindsym l exec "~/scripts/lock.sh"
@@ -151,8 +152,8 @@ set $monitor_2 "DP-1"
 workspace $ws1 output $monitor_1
 workspace $ws10 output $monitor_2
 
-bindsym $mod+Ctrl+1 move workspace to output $monitor_1
-bindsym $mod+Ctrl+2 move workspace to output $monitor_2
+bindsym $mod+Ctrl+1 move workspace to output $monitor_2
+bindsym $mod+Ctrl+2 move workspace to output $monitor_1
 
 # ============================== Design
 # Remove title
diff --git a/laptop/.config/polybar/config b/laptop/.config/polybar/config
index e4103d4..5d5627e 100644
--- a/laptop/.config/polybar/config
+++ b/laptop/.config/polybar/config
@@ -27,6 +27,9 @@ separator = /
 modules-left = i3 xwindow
 modules-right = network volume backlight battery date
 
+tray-position = right
+tray-padding = 1
+
 foreground = ${colors.foreground}
 background = ${colors.background}
 
@@ -38,6 +41,13 @@ inherit = bar/laptop
 
 modules-right = networkupdown volume date
 
+[bar/desktop_second]
+inherit = bar/desktop
+
+tray-position = none
+
+modules-right = volume date
+
 [module/i3]
 type = internal/i3
 pin-workspaces = true
diff --git a/laptop/.config/polybar/launch.sh b/laptop/.config/polybar/launch.sh
index 74eab4e..d33f806 100755
--- a/laptop/.config/polybar/launch.sh
+++ b/laptop/.config/polybar/launch.sh
@@ -5,8 +5,9 @@ if type "xrandr"; then
   for mon in $(xrandr --query | grep " connected" | cut -d" " -f1); do
     if [ $mon = "eDP-1"  ]; then
       MONITOR=$mon polybar --reload laptop &
-    else
-      MONITOR=$mon polybar --reload desktop &
+    elif [ $mon = "DP-3" ]; then
+      MONITOR="DP-3" polybar --reload desktop &
+      MONITOR="DP-1" polybar --reload desktop_second &
     fi
   done
 else
diff --git a/laptop/.vimrc b/laptop/.vimrc
index 023358f..929ad4a 100644
--- a/laptop/.vimrc
+++ b/laptop/.vimrc
@@ -49,7 +49,7 @@ set cursorline
 set ruler
 
 set showmatch " highlights paranthesis
-set laststatus=0 " remove status bar
+set laststatus=2 " remove status bar
 set mat=5
 set noswapfile " can be problematic on some systems
 set confirm " can't quit without saving
diff --git a/laptop/.zshrc b/laptop/.zshrc
index df909a5..1d92650 100644
--- a/laptop/.zshrc
+++ b/laptop/.zshrc
@@ -24,7 +24,6 @@ zstyle ':vcs_info:git:*' formats ' [%b ]'
 export EDITOR="nvim"
 export LANG="en_US.UTF-8"
 export PATH=$PATH:$HOME/.local/bin:$HOME/scripts:$HOME/.cargo/bin
-export BROWSER="firefox"
 
 # ============================== Aliases
 alias fontslist="fc-list :scalable=true:spacing=mono: family"
@@ -34,7 +33,8 @@ if [[ -x $(which nvim 2> /dev/null) ]]; then
     alias vim="nvim"
 fi
 
-alias r="ranger"
+alias updoot="yay -Syu"
+
 alias s="cd ~/scripts/"
 alias c='clear'
 
diff --git a/laptop/scripts/lock.sh b/laptop/scripts/lock.sh
index ea10864..3961f6b 100755
--- a/laptop/scripts/lock.sh
+++ b/laptop/scripts/lock.sh
@@ -1,60 +1,6 @@
 #!/bin/sh
 
-blank="ffffff00"
-
-nord0="2e3440"
-nord1="3b4252"
-
-frost2="eceff4"
-
-blue2="88c0d0"
-blue3="5e81ac"
-
-red="bf616a"
-yellow="ebcb8b"
-green="a3be8c"
-
-inside="${nord0}77"
-
-i3lock \
-    -i ~/data/wallpaper/lockscreen.png \
-    \
-    --insidecolor=${inside} \
-    --ringcolor=${nord0}ff \
-    --linecolor=${blank} \
-    --keyhlcolor=${green}ff \
-    --bshlcolor=${red}ff \
-    --separatorcolor=${blue3}ff \
-    \
-    --insidevercolor=${inside} \
-    --ringvercolor=${yellow}ff \
-    --verifcolor=${yellow}ff \
-    \
-    --insidewrongcolor=${inside} \
-    --ringwrongcolor=${red}ff \
-    --wrongcolor=${red}ff \
-    \
-    --layoutcolor=ECEFF4ff \
-    --timecolor=ECEFF4ff \
-    --datecolor=ECEFF4ff \
-    \
-    --clock \
-    --indicator \
-    \
-    --timestr="%H:%M" \
-    --datestr="%B %d, %Y" \
-    --timepos="ix:iy-10" \
-    \
-    --timesize=17 \
-    --datesize=13 \
-    \
-    --time-font="InconsolataLGC Nerd Font Mono" \
-    --date-font="InconsolataLGC Nerd Font Mono" \
-    \
-    --veriftext="" \
-    --noinputtext="" \
-    --locktext="" \
-    --wrongtext="" \
-    \
-    --ring-width 4 \
-    --radius 100
+xlock \
+    -font 'FiraCode Nerd Font Mono' \
+    -mode maze \
+    -info ''