diff --git a/rc.lua b/rc.lua
index cbe9dce..9bdb5bc 100644
--- a/rc.lua
+++ b/rc.lua
@@ -72,11 +72,26 @@ end
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers
 beautiful.init('/usr/share/awesome/themes/default/theme.lua')
-theme.border_width = 1
 theme.font = 'Terminus 9'
 theme.taglist_squares_sel = nil
 theme.taglist_squares_unsel = nil
 
+theme.bg_normal     = "#282828"
+theme.bg_focus      = "#607D8B"
+theme.bg_urgent     = "#D15A00"
+theme.bg_minimize   = "#373737"
+theme.bg_systray    = theme.bg_normal
+
+theme.fg_normal     = "#aaaaaa"
+theme.fg_focus      = "#ffffff"
+theme.fg_urgent     = "#ffffff"
+theme.fg_minimize   = "#ffffff"
+
+theme.border_width  = 2
+theme.border_normal = theme.bg_normal
+theme.border_focus  = theme.bg_focus
+theme.border_marked = "#608B63"
+
 -- amount of pixels to snap windows from
 snap = 7
 
diff --git a/tmux.conf b/tmux.conf
index 71c70f9..5022d67 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -45,7 +45,7 @@ set -g terminal-overrides "rxvt-unicode*:sitm@,ritm@"
 
 set -g status-bg "colour8"
 set -g message-command-fg "colour7"
-set -g status-justify "left"
+set -g status-justify "centre"
 set -g status-left-length "100"
 set -g status "on"
 set -g pane-active-border-fg "colour14"
@@ -67,4 +67,4 @@ setw -g window-status-bg "colour8"
 set -g status-left "#[fg=colour15,bg=colour14,bold] #h #[fg=colour14,bg=colour11,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] #S #[fg=colour11,bg=colour8,nobold,nounderscore,noitalics]#[default]"
 set -g status-right "#[fg=colour10,bg=colour8]#I:#P #[fg=colour11,bg=colour8,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] %a %e #[fg=colour14,bg=colour11,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] %k:%M "
 setw -g window-status-format " #I:#W "
-setw -g window-status-current-format "#[fg=colour7,bg=colour8] #I:#W #[default]"
+setw -g window-status-current-format "#[fg=colour7,bg=colour8][#I:#W]#[default]"
diff --git a/xresources b/xresources
index 5f0df12..8ebd048 100644
--- a/xresources
+++ b/xresources
@@ -21,6 +21,7 @@ URxvt.visualBell:       false
 URxvt.urgentOnBell:     true
 URxvt.cursorUnderline:  true
 URxvt.termName:         rxvt-unicode-256color
+URxvt.internalBorder:   0
 URxvt.fading:           0
 URxvt.depth:            32