diff --git a/minimal.vimrc.vim b/minimal.vimrc.vim
index ba3c3f5..9af64d1 100644
--- a/minimal.vimrc.vim
+++ b/minimal.vimrc.vim
@@ -72,9 +72,9 @@
   "Plug 'Shougo/denite.nvim'
   Plug 'ctrlpvim/ctrlp.vim'
   Plug 'asolkar/vim-color-molokini'
-  Plug 'flrnprz/plastic.vim'
   Plug 'nathanaelkane/vim-indent-guides'
   Plug 'luochen1990/rainbow'
+  Plug 'https://gitlab.devtools.intel.com/masolkar/vim-iosf.git' " intel
   Plug 'vhda/verilog_systemverilog.vim'
   Plug 'nanotech/jellybeans.vim'
 
@@ -96,7 +96,7 @@
       if has("mac")
         set guifont=Iosevka-Term:h16
       elseif has("win32")
-        set guifont=Iosevka\ Term\ Regular\ 13
+        set guifont=Iosevka\ Term\ Regular\ 15
       else
         set guifont=Iosevka\ Term\ Regular\ 13.5
       end
@@ -132,9 +132,9 @@
     set colorcolumn=120
   endif
 
-  let g:molokini_gui_italic = 0
+  "let g:molokini_gui_italic = 0
   colorscheme molokini
-  "colorscheme deus
+
   set norelativenumber
   set number
 
@@ -215,6 +215,10 @@
 
   let g:rainbow_active = 1 "0 if you want to enable it later via :RainbowToggle
 
+  let g:iosftrk_folddisable = 1 " intel
+  let g:iosfsbtrk_folddisable = 1 " intel
+
+  let g:fugitive_git_executable = '/usr/intel/bin/git' " intel
 " }}}
 
 " Key bindings {{{
@@ -279,6 +283,8 @@
 "
 " File associations {{{
 
+  au! BufRead,BufNewFile *_iosf*_trk.out   set filetype=iosftrk " intel
+  au! BufRead,BufNewFile *_iosfsb*_trk.out set filetype=iosfsbtrk " intel
   au! BufRead,BufNewFile * RainbowToggleOn
 
 " }}}
diff --git a/user.tmux.conf b/user.tmux.conf
index cd5ba1c..d722c6c 100644
--- a/user.tmux.conf
+++ b/user.tmux.conf
@@ -2,12 +2,17 @@
 # TMUX Configuration file
 #
 # General settings {{{
-    set -g default-terminal "xterm-256color"
+    # set -g default-terminal "xterm-256color"
+    set -g default-terminal "screen-256color"
+    set -g default-command "$SHELL -l"
     set -g prefix C-a
     unbind-key C-b
     bind-key C-a send-prefix
 
-    set -as terminal-overrides ',*:U8=a0'
+    # vi mode
+    set-window-option -g mode-keys vi
+    set -as terminal-overrides ",*:U8=a0"
+    # set-option -ga terminal-overrides ",screen-256color:Tc"
 
     set -g mouse on
     set -g status-position top
@@ -23,15 +28,18 @@
     # set -g @plugin 'git@github.com/user/plugin'
     # set -g @plugin 'git@bitbucket.com/user/plugin'
 
+    set -g @themepack-status-right-area-left-format "#(~/bin/tmux_status)  %H:%M"
+
     set -g @plugin 'tmux-plugins/tmux-resurrect'
     set -g @plugin 'jimeh/tmux-themepack'
     set -g @themepack 'powerline/default/gray'
-
-    set -g @themepack-status-right-area-left-format "#(~/bin/tmux_status)  %H:%M"
 #     }}}
 # }}}
 
 # Keyboard shortcuts {{{
+    # Reload tmux config
+    bind-key r source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
+
     # Navigation
     bind -n M-h select-pane -L
     bind -n M-j select-pane -D
@@ -45,13 +53,18 @@
     # Clipboard integration
     # ctrl+c to send to clipboard
 
-    # Selection with mouse should copy to clipboard right away, in addition to the default action.
-    unbind -n -Tcopy-mode-vi MouseDragEnd1Pane
-    bind -Tcopy-mode-vi MouseDragEnd1Pane send -X copy-selection-and-cancel\; run "tmux save-buffer - | xclip -i -sel clipboard > /dev/null"
+    # # Selection with mouse should copy to clipboard right away, in addition to the default action.
+    # unbind -n -T copy-mode-vi MouseDragEnd1Pane
+    # bind -T copy-mode-vi MouseDragEnd1Pane send -X copy-selection-and-cancel\; run "tmux save-buffer - | xclip -i -sel clipboard > /dev/null"
 
-    # Middle click to paste from the clipboard
-    unbind-key MouseDown2Pane
-    bind-key -n MouseDown2Pane run "tmux set-buffer \"$(xclip -o -sel clipboard)\"; tmux paste-buffer"
+    # unbind -n -T copy-mode-vi 'v'
+    # bind -T copy-mode-vi 'v' send -X begin-selection
+    # unbind -n -T copy-mode-vi 'y'
+    # bind -T copy-mode-vi 'y' send -X copy-selection-and-cancel\; run "tmux save-buffer - | xclip -i -sel clipboard > /dev/null"
+
+    # # Middle click to paste from the clipboard
+    # unbind-key MouseDown2Pane
+    # bind-key -n MouseDown2Pane run "tmux set-buffer \"$(xclip -o -sel clipboard)\"; tmux paste-buffer"
 # }}}
 
 # Footer {{{