diff --git a/i3/i3.dotfile/config b/i3/i3.dotfile/config
index 67211ba..2377b99 100644
--- a/i3/i3.dotfile/config
+++ b/i3/i3.dotfile/config
@@ -9,6 +9,7 @@
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
 
 set $mod Mod4
+set $lock lock
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below. ISO 10646 = Unicode
@@ -24,10 +25,11 @@ font pango:Meslo LG L DZ 8
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec xterm
+bindsym $mod+Return exec urxvt
+bindsym $mod+Shift+Return exec terminator
 
 # kill focused window
-bindsym $mod+Shift+q kill
+bindsym $mod+q kill
 # start dmenu (a program launcher)
 #bindsym $mod+d exec dmenu_run -sb "#880000"
 bindsym $mod+d exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-8'"
@@ -75,8 +77,6 @@ bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 
-bindsym $mod+q exec lock
-
 # toggle tiling / floating
 bindsym $mod+Shift+space floating toggle
 
@@ -121,7 +121,6 @@ bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
 # Pulse Audio controls
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 -- +10% && killall -SIGUSR1 i3status
@@ -160,6 +159,23 @@ mode "resize" {
         bindsym Escape mode "default"
 }
 
+set $quit_msg [c]ancel [l]ock [e]xit [r]estart [s]hutdown; suspend to [d]isk [m]emory [h]ybrid
+
+mode "$quit_msg" {
+    bindsym c mode "default"
+    bindsym l exec "i3-msg mode 'default' && $lock"
+    bindsym e exit
+    bindsym r exec systemctl reboot
+    bindsym s exec systemctl poweroff
+    bindsym d exec "i3-msg mode 'default' && $lock && systemctl hibernate"
+    bindsym m exec "i3-msg mode 'default' && $lock && systemctl suspend"
+    bindsym h exec "i3-msg mode 'default' && $lock && systemctl hybrid-sleep"
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+
+bindsym $mod+Shift+e mode "$quit_msg"
+
 bindsym $mod+r mode "resize"
 
 new_window normal 0
@@ -170,6 +186,7 @@ for_window [instance="xterm"] border none
 for_window [instance="gvim"] border none
 for_window [class="thunderbird"] border none
 for_window [class="chrome"] border none
+for_window [class="(?i)opera"] border none
 for_window [class="(?i)firefox"] border none
 for_window [instance="dwb"] border none
 for_window [instance="subl3"] border none
@@ -182,7 +199,7 @@ client.unfocused #333333 #222222 #888888 #000000
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-        status_command python ~/.i3/status.py
+        status_command python3 ~/.i3/status.py
 	position top
 
 	colors {
@@ -196,10 +213,11 @@ bar {
 	}
 }
 
-exec --no-startup-id compton -b --vsync opengl-swc --backend glx --config /dev/null
+exec --no-startup-id compton -b --vsync opengl-swc --backend glx -f -D 5 --config /dev/null
 exec --no-startup-id feh --bg-scale /home/ian/Pictures/Wallpapers/wallpaper.jpg
 exec --no-startup-id seafile-applet
 exec --no-startup-id xrdb -merge ~/.Xdefaults
+exec --no-startup-id nm-applet
 
 bindsym $mod+u exec setxkbmap us
 bindsym $mod+c exec setxkbmap us -variant colemak