diff --git a/tmux.conf b/tmux.conf
index de664fa..3b29d85 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -42,7 +42,7 @@ set -g set-titles "off"
 set -g status-left-length "20"
 set -g status-right-length "40"
 set -g terminal-override "rxvt-unicode*:sitm@,ritm@,rxvt-unicode*:Tc,xterm-*:Tc"
-set -g default-terminal "screen"
+set -g default-terminal "tmux"
 set -g status-position "bottom"
 set -g status-justify "centre"
 set -g status-left-length "100"
diff --git a/vimrc b/vimrc
index 5bea0d5..a7548be 100644
--- a/vimrc
+++ b/vimrc
@@ -92,6 +92,7 @@ if v:version >= 700
         Plug 'nvie/vim-togglemouse'            "hotkey to toggle mouse
         Plug 'vim-airline/vim-airline'         "airline
         Plug 'vim-airline/vim-airline-themes'  "themes for airline
+        " Plug 'itchyny/lightline.vim'           "simpler airline replacement
         Plug 'vimwiki/vimwiki'                 "another attempt at doing notebook via vim
         Plug 'neomake/neomake'                 "linter
 
@@ -163,7 +164,7 @@ if v:version >= 700
         colorscheme solarized8_light
         map <S-Insert> <MiddleMouse>
         map! <S-Insert> <MiddleMouse>
-    elseif has("nvim") || v:version >= 704
+    elseif (has("nvim") || v:version >= 704) && $TERM != 'screen'
         " fix tmux and st
         set t_8f=[38;2;%lu;%lu;%lum
         set t_8b=[48;2;%lu;%lu;%lum