diff --git a/gtkrc-2.0/gtkrc-2.0.symlink b/gtkrc-2.0/gtkrc-2.0.symlink
index 948bc3e..5a940ab 100644
--- a/gtkrc-2.0/gtkrc-2.0.symlink
+++ b/gtkrc-2.0/gtkrc-2.0.symlink
@@ -4,7 +4,7 @@
 include "/home/max/.gtkrc-2.0.mine"
 gtk-theme-name="Clearlooks"
 gtk-icon-theme-name="hicolor"
-gtk-font-name="System San Francisco Text 18"
+gtk-font-name="System San Francisco Text 16"
 gtk-cursor-theme-name="DMZ-White"
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
diff --git a/i3/i3.symlink/config b/i3/i3.symlink/config
index 05bce8e..c75fd7c 100644
--- a/i3/i3.symlink/config
+++ b/i3/i3.symlink/config
@@ -9,7 +9,7 @@
 # layout, use the i3-config-wizard
 #
 
-font pango:System San Francisco Text 18
+font pango:System San Francisco Text 16
 
 # use these keys for focus, movement, and resize directions when reaching for
 # the arrows is not convenient
@@ -26,53 +26,11 @@ set $inactive-text-color #676e7d
 set $urgent-bg-color #e53935
 set $indicator-color #00ff00
 
-# Window colours
-client.focused \
-  $bg-color \
-  $bg-color \
-  $text-color \
-  $indicator-color
-
-client.unfocused \
-  $inactive-bg-color \
-  $inactive-bg-color \
-  $inactive-text-color \
-  $indicator-color
-
-client.focused_inactive \
-  $inactive-bg-color \
-  $inactive-bg-color \
-  $inactive-text-color \
-  $indicator-color
-client.urgent \
-  $urgent-bg-color \
-  $urgent-bg-color \
-  $text-color \
-  $indicator-color
-
 bar {
         status_command i3status
-        colors {
-                background $bg-color
-
-                focused_workspace \
-                  $bg-color \
-                  $bg-color \
-                  $text-color
-
-                inactive_workspace \
-                  $inactive-bg-color \
-                  $inactive-bg-color \
-                  $inactive-text-color
-
-                urgent_workspace \
-                  $urgent-bg-color \
-                  $urgent-bg-color \
-                  $text-color
-        }
 }
 
-bindsym Mod4+shift+slash exec i3lock --color "$bg-color"
+bindsym Mod4+shift+apostrophe exec i3lock --color "$bg-color"
 
 # use Mouse+Mod4 to drag floating windows to their wanted position
 floating_modifier Mod4
@@ -83,7 +41,7 @@ bindsym Mod4+Return exec i3-sensible-terminal
 # kill focused window
 bindsym Mod4+Shift+q kill
 
-bindsym Mod4+d exec rofi -show run -lines 3 -eh 2 -width 100 -padding 10 -opacity "85" -bw 0 -bc "$bg-color" -bg "$bg-color" -fg "$text-color" -hlbg "$bg-color" -hlfg "#9575cd" -font "System San Francisco Display 18"
+bindsym Mod4+space exec dmenu_run -i -fn "System San Francisco Text 16"
 
 # change focus
 bindsym Mod4+$left focus left
@@ -115,7 +73,7 @@ bindsym Mod4+e layout toggle split
 bindsym Mod4+Shift+space floating toggle
 
 # change focus between tiling / floating windows
-bindsym Mod4+space focus mode_toggle
+bindsym Mod4+d focus mode_toggle
 
 # focus the parent container
 bindsym Mod4+a focus parent
@@ -156,7 +114,7 @@ bindsym Mod4+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym Mod4+Shift+r restart
 # exit i3 (logs you out of your X session)
-bindsym Mod4+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'"
+bindsym Mod4+Shift+e exec "i3-msg exit"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -178,10 +136,17 @@ mode "resize" {
 
 bindsym Mod4+r mode "resize"
 
+# Pulse Audio controls
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 1 +5% #increase sound volume
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 1 -5% #decrease sound volume
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 1 toggle # mute sound
+
+# Sreen brightness controls
+bindsym XF86MonBrightnessUp exec xbacklight -inc 10 # increase screen brightness
+bindsym XF86MonBrightnessDown exec xbacklight -dec 10 # decrease screen brightness
 
 hide_edge_borders both
 focus_follows_mouse no
 
 exec xmodmap ~/.xmodmap
 exec compton
-exec gnome-terminal