diff --git a/.config/i3status/config.gen b/.config/i3status/config.gen
index 9051cf9..f9524ff 100755
--- a/.config/i3status/config.gen
+++ b/.config/i3status/config.gen
@@ -8,7 +8,6 @@ general {
 
 order += "disk /"
 order += "disk /home"
-order += "run_watch DHCP"
 CONFIG
 
 wireless_interface_config=''
@@ -63,19 +62,12 @@ done
 
 cat <<CONFIG
 order += "load"
-order += "tztime annapolis"
-order += "tztime santaclara"
 order += "tztime local"
 $cpu_temperature_config
 $wireless_interface_config
 $ethernet_interface_config
 $battery_config
 
-run_watch DHCP {
-	pidfile = "/var/run/dhc*.pid"
-	format = "%title"
-}
-
 tztime local {
 	format = "%Y-%m-%d %H:%M:%S"
 }
@@ -91,14 +83,4 @@ disk "/" {
 disk "/home" {
 	format = "/home %free"
 }
-
-tztime annapolis {
-	format = "Ann %H:%M"
-	timezone = "US/Eastern"
-}
-
-tztime santaclara {
-	format = "S-C %H:%M"
-	timezone = "US/Pacific"
-}
 CONFIG
diff --git a/.i3/config b/.i3/config
index 1cb67a9..db89580 100644
--- a/.i3/config
+++ b/.i3/config
@@ -88,11 +88,11 @@ bindsym $mod+a focus parent
 #bindsym $mod+d focus child
 
 # switch to workspace
-bindsym $mod+1 workspace "1: term"
-bindsym $mod+2 workspace "2: browser"
-bindsym $mod+3 workspace "3: im"
-bindsym $mod+4 workspace "4: vbox"
-bindsym $mod+5 workspace 5
+bindsym $mod+1 workspace 1: term
+bindsym $mod+2 workspace 2: browser
+bindsym $mod+3 workspace 3: im
+bindsym $mod+4 workspace 4: vbox
+bindsym $mod+5 workspace 5: media
 bindsym $mod+6 workspace 6
 bindsym $mod+7 workspace 7
 bindsym $mod+8 workspace 8
@@ -104,7 +104,7 @@ bindsym $mod+Shift+1 move container to workspace "1: term"
 bindsym $mod+Shift+2 move container to workspace "2: browser"
 bindsym $mod+Shift+3 move container to workspace "3: im"
 bindsym $mod+Shift+4 move container to workspace "4: vbox"
-bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+5 move container to workspace "5: media"
 bindsym $mod+Shift+6 move container to workspace 6
 bindsym $mod+Shift+7 move container to workspace 7
 bindsym $mod+Shift+8 move container to workspace 8
@@ -112,11 +112,15 @@ bindsym $mod+Shift+9 move container to workspace 9
 bindsym $mod+Shift+0 move container to workspace 10
 
 workspace_auto_back_and_forth yes
+workspace_layout tabbed
+hide_edge_borders both
+force_display_urgency_hint 0
 
-assign [class="xterm"]     "1: term"
-assign [class="Navigator"] "2: browser"
-assign [class="Skype"]     "3: im"
-assign [title="Psi+"]      "3: im"
+assign [class="xterm"]      "1: term"
+assign [class="Navigator"]  "2: browser"
+assign [class="Skype"]      "3: im"
+assign [title="Psi+"]       "3: im"
+assign [class="clementine"] "5: media"
 
 for_window [class="Skype" title="Profile for"] floating enable
 for_window [window_role="pop-up"] floating enable
@@ -124,8 +128,8 @@ for_window [window_role="pop-up"] floating enable
 #bindsym XF86AudioRaiseVolume exec amixer -q set Master 2dB+ unmute
 #bindsym XF86AudioLowerVolume exec amixer -q set Master 2dB- unmute
 #bindsym XF86AudioMute exec amixer -q set Master toggle
-bindsym XF86MonBrightnessDown exec xbacklight -5
-bindsym XF86MonBrightnessUp exec xbacklight +5
+bindsym XF86MonBrightnessDown exec xbacklight -10
+bindsym XF86MonBrightnessUp exec xbacklight +10
 
 # reload the configuration file
 bindsym $mod+Shift+c reload