diff --git a/config/i3/config b/config/i3/config
index e6e668a..1de3097 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -1,10 +1,58 @@
+# i3 Config
+
+# -------------------------------------------------------------------------------------------------
+# VARIABLES
+#
+
+# Default modifier
 set $mod Mod4
 
-font pango:DejaVu Sans Mono 9
+# Workspaces names
+set $wksp1 "1: Main"
+set $wksp2 "2: Dev"
+set $wksp3 "3: Social"
+set $wksp4 "4: Music"
+set $wksp5 "5: Graphics"
+set $wksp6 "6: Minecraft"
+set $wksp7 "7: Remote"
+set $wksp8 "8"
+set $wksp9 "9: Databases"
+set $wksp10 "10: External"
+
+# Colors (Nord's theme)
+set $nord0   #2E3440
+set $nord1   #3B4252
+set $nord2   #434C5E
+set $nord3   #4C566A
+set $nord4   #D8DEE9
+set $nord5   #E5E9F0
+set $nord6   #ECEFF4
+set $nord7   #8FBCBB
+set $nord8   #88C0D0
+set $nord9   #81A1C1
+set $nord10  #5E81AC
+set $nord11  #BF616A
+set $nord12  #D08770
+set $nord13  #EBCB8B
+set $nord14  #A3BE8C
+set $nord15  #B48EAD
+
+# Modal
+set $modalBorder 4
+set $modalWidth 1280
+set $modalHeight 800
+
+# Font
+set $font DejaVu Sans Mono 9
+
+# Border
+default_border pixel 4
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
+# Default font
+font pango:$font
 
 # -------------------------------------------------------------------------------------------------
 # WINDOW FOCUS/SPLIT/MOVE
@@ -47,17 +95,6 @@ bindsym $mod+a focus parent
 # WORKSPACES
 #
 
-set $wksp1 "1: Main"
-set $wksp2 "2: Dev"
-set $wksp3 "3: Social"
-set $wksp4 "4: Music"
-set $wksp5 "5: Graphics"
-set $wksp6 "6: Minecraft"
-set $wksp7 "7: Remote"
-set $wksp8 "8"
-set $wksp9 "9: Databases"
-set $wksp10 "10: External"
-
 workspace $wksp9 output DP-2-2
 workspace $wksp10 output DP-2-2
 
@@ -120,23 +157,6 @@ bindsym $mod+r mode "resize"
 # COLORS
 #
 
-set $nord0   #2E3440
-set $nord1   #3B4252
-set $nord2   #434C5E
-set $nord3   #4C566A
-set $nord4   #D8DEE9
-set $nord5   #E5E9F0
-set $nord6   #ECEFF4
-set $nord7   #8FBCBB
-set $nord8   #88C0D0
-set $nord9   #81A1C1
-set $nord10  #5E81AC
-set $nord11  #BF616A
-set $nord12  #D08770
-set $nord13  #EBCB8B
-set $nord14  #A3BE8C
-set $nord15  #B48EAD
-
 #colors                     border  back    text    indicator   child_border
 client.focused              $nord9  $nord9  $nord0  $nord9  $nord9
 client.focused_inactive     $nord0  $nord0  $nord9  $nord0  $nord0
@@ -178,7 +198,6 @@ exec --no-startup-id i3-msg 'exec nm-applet &'
 exec --no-startup-id i3-msg 'exec nextcloud &'
 exec --no-startup-id i3-msg 'exec remmina -i &'
 exec --no-startup-id xsettingsd &
-#exec --no-startup-id compton --config ~/.compton.conf &
 exec --no-startup-id setxkbmap -option compose:rctrl &
 exec --no-startup-id libinput-gestures-setup start
 exec --no-startup-id i3-msg 'exec /usr/bin/terminator'
@@ -205,20 +224,17 @@ workspace_layout tabbed
 bindsym $mod+Shift+q kill
 bindsym Control+q kill
 
-# start dmenu (a program launcher)
-bindsym $mod+d exec dmenu_run -fn 'Droid Sans Mono-10'
+# start Finder
 bindsym Mod1+space exec "rofi -show combi"
 
-
 # start a terminal
 bindsym $mod+Return exec terminator
 
 # Lock session
 bindsym $mod+Mod1+l exec "~/Bin/lock.sh"
-bindsym Mod1+Control+q exec "~/Bin/lock.sh"
 
 # File browser
-bindsym $mod+f exec "rofi -modi 'fb:~/.local/share/rofi/rofi-file-browser.sh' -show fb"
+bindsym $mod+f exec "terminator -T 'File Browser' -x ranger"
 
 # Find file in user directory
 bindsym $mod+x exec "rofi -modi 'find:~/.local/share/rofi/finder.sh' -show find"
@@ -226,8 +242,9 @@ bindsym $mod+x exec "rofi -modi 'find:~/.local/share/rofi/finder.sh' -show find"
 # Show top
 bindsym $mod+t exec "rofi -show top -modi top"
 
-# Screen layout
+# Display
 bindsym $mod+p exec "~/Bin/screenlayoutrofi.sh"
+bindsym XF86Display exec ~/Bin/screenlayoutrofi.sh
 
 # Multimedia keys
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume `pactl info|grep Sink|cut -d: -f 2` +5%
@@ -250,11 +267,8 @@ bindsym $mod+Print exec ~/Bin/slip
 bindsym --release Shift+Print exec "scrot -s -e 'xclip -selection c -t image/png < $f && mv $f ~/Pictures/screenshots'"
 bindsym --release Print exec "scrot -e 'xclip -selection c -t image/png < $f && mv $f ~/Pictures/screenshots'"
 
-# Switch screen layouts
-bindsym XF86Display exec ~/Bin/screenlayout.sh
-
 # Calendar
-bindsym $mod+c exec "rxvt-unicode -e khal interactive"
+bindsym $mod+c exec "terminator -T 'Calendar' -x khal interactive"
 
 # Note
 bindsym $mod+n exec "zettlr"
@@ -264,17 +278,14 @@ bindsym $mod+n exec "zettlr"
 #
 
 for_window [class="Spotify"], move container to workspace $wksp4
-#for_window [class="Firefox"], move container to workspace $wksp1
-#for_window [class="Ristretto"] fullscreen enable
-for_window [title="khal"] floating enable border pixel 8 resize set 800 600
-for_window [class="JViewer"] floating enable border pixel 8
+for_window [class="Terminator" title="Calendar"] floating enable border pixel $modalBorder resize set $modalWidth $modalHeight, move absolute position center
+for_window [class="Terminator" title="File Browser"] floating enable border pixel $modalBorder resize set $modalWidth $modalHeight, move absolute position center
+for_window [class="JViewer"] floating enable border pixel $modalBorder
 
 # -------------------------------------------------------------------------------------------------
 # OTHER STUFF
 #
 
-default_border pixel 4
-
 # Power save mode and Auto lock screen
 exec --no-startup-id xset s 300 30
 exec --no-startup-id xset dpms 120