diff --git a/files/tmux-256color.terminfo b/files/tmux-256color.terminfo
new file mode 100644
index 0000000..512091f
--- /dev/null
+++ b/files/tmux-256color.terminfo
@@ -0,0 +1,3 @@
+tmux-256color|tmux with 256 colors,
+  ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m, Ms@,
+  khome=\E[1~, kend=\E[4~,  use=xterm-256color, use=screen-256color,
diff --git a/files/xterm-256color-italic.terminfo b/files/xterm-256color-italic.terminfo
new file mode 100644
index 0000000..268e449
--- /dev/null
+++ b/files/xterm-256color-italic.terminfo
@@ -0,0 +1,3 @@
+xterm-256color-italic|xterm with 256 colors and italic,
+  sitm=\E[3m, ritm=\E[23m,
+  use=xterm-256color,
diff --git a/tmux.conf.local b/tmux.conf.local
index 4f19491..787bee4 100644
--- a/tmux.conf.local
+++ b/tmux.conf.local
@@ -12,6 +12,7 @@
 #   - and iTerm2 is configured to send [1;9A -> [1;9D for option + arrow keys
 # then uncomment the following line to make Meta + arrow keys mapping work
 set -ga terminal-overrides "*:kUP3=\e[1;9A,*:kDN3=\e[1;9B,*:kRIT3=\e[1;9C,*:kLFT3=\e[1;9D"
+set -as terminal-overrides ',xterm*:Tc:sitm=\E[3m'
 
 
 # -- windows & pane creation ---------------------------------------------------
diff --git a/vim/plugin/030_theming.vim b/vim/plugin/030_theming.vim
index a81e9d1..bd85027 100644
--- a/vim/plugin/030_theming.vim
+++ b/vim/plugin/030_theming.vim
@@ -3,12 +3,15 @@
 if &term =~ '256color'
       set t_ut=
 endif
+let &t_8f="\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b="\<Esc>[48;2;%lu;%lu;%lum"
 
 " Base colourscheme
-colorscheme cobalt2
+let g:jellybeans_use_term_italics = 1
+colorscheme jellybeans
 
 "Airline Theme
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_powerline_fonts = 1
-let g:airline_theme= "cobalt2"
+let g:airline_theme= "jellybeans"