diff --git a/termite_config b/termite_config
index 63ca088..7a61356 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 = chromium
 size_hints = false
 
 [colors]
-#cursor = #fdf6e3
+cursor = #fdf6e3
 foreground = #839496
 foreground_bold = #fdf6e3
 background = rgba(0, 20, 26, 0.8)
diff --git a/vimrc b/vimrc
index 24d8657..9469fe9 100644
--- a/vimrc
+++ b/vimrc
@@ -23,10 +23,12 @@ set sidescroll=1
 set noerrorbells visualbell t_vb=
 
 " enforce 256 colours for ssh connections and VTE
-if $TERM == 'xterm' || $TERM == 'screen' || exists("$SSH_CLIENT")
+if $TERM =~ '^xterm.*$' || $TERM =~ '^rxvt-unicode.*$' || $TERM == '^screen.*$'
+	let &t_SI .= "\<Esc>[6 q"
+	let &t_EI .= "\<Esc>[4 q"
 	let &t_Co=256
 endif
-if $LANG =~ '^.*UTF-8$' || $LANG =~ 'utf8$'
+if $LANG =~ 'UTF-8$' || $LANG =~ 'utf8$'
 	set termencoding=utf-8
 	set encoding=utf-8
 endif