diff --git a/rc.lua b/rc.lua
index 429e251..e5afbff 100644
--- a/rc.lua
+++ b/rc.lua
@@ -75,21 +75,7 @@ theme.taglist_font = 'Terminus 11'
 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"
+theme.border_width = 2
 
 -- amount of pixels to snap windows from
 snap = 7
@@ -101,7 +87,7 @@ if exists(wallpaper) then
 end
 
 -- This is used later as the default terminal and editor to run.
-terminal = 'urxvt'
+terminal = 'termite'
 editor = os.getenv('EDITOR') or 'vim'
 editor_cmd = terminal .. ' -e ' .. editor
 
diff --git a/shellrc b/shellrc
index e5d6777..593836f 100644
--- a/shellrc
+++ b/shellrc
@@ -40,7 +40,6 @@ export LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd
 
 # }}}
 # {{{ common aliases
-alias vi='command vim'
 alias less='command less -R'
 alias cower='command cower -c'
 alias pacman='command pacman --color=auto'
@@ -51,7 +50,10 @@ alias hist='fc -l 1'
 alias beep='printf "\007"'
 alias fixterm='printf "c"'
 if (is_exec nvim && [[ -r ${HOME}/.vimrc ]]); then
-	alias nvim='command nvim -u ~/.vimrc'
+	alias vim='command nvim -u ~/.vimrc'
+	alias vi='command nvim -u ~/.vimrc'
+else
+	alias vi='command vim'
 fi
 
 # iconv
diff --git a/termite_config b/termite_config
index aa841d0..f49f53e 100644
--- a/termite_config
+++ b/termite_config
@@ -12,12 +12,12 @@ scrollback_lines = 1000
 search_wrap = true
 icon_name = terminal
 cursor_blink = off
-cursor_shape = block
+cursor_shape = underline
 browser = firefox
 size_hints = false
 
 [colors]
-#cursor = #002b36
+cursor = #002b36
 foreground = #657b83
 foreground_bold = #002b36
 background = #fdf6e3