diff --git a/.config/oni/config.js b/.config/oni/config.js
index 5e309c8..8e977ce 100644
--- a/.config/oni/config.js
+++ b/.config/oni/config.js
@@ -23,6 +23,8 @@ exports.deactivate = function (oni) {
 
 exports.configuration = {
     //add custom config here, such as
+    "ui.colorscheme": "hybrid",
+    "language.vue.languageServer.command":"vls",
     "experimental.indentLines.enabled": true,
     "oni.useDefaultConfig": true,
     "oni.bookmarks": ["~/Documents"],
diff --git a/.tmux.conf b/.tmux.conf
index fdd70a2..ca8c1bf 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -45,8 +45,6 @@ set -g display-time 1000      # slightly longer status messages display time
 
 set -g status-interval 10     # redraw status line every 10 seconds
 
-# clear both screen and history
-bind -n C-l send-keys C-l \; run 'sleep 0.1' \; clear-history
 
 # activity
 set -g monitor-activity on
diff --git a/.vimrc b/.vimrc
index 55cdced..5b9c55b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -20,14 +20,15 @@ if exists('g:gui_oni')
     set noshowcmd
 else 
     " Statements here
-    Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
+"    Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
                                     "with ./<plugin location>/install.sh
                                     " --clang-completer
                                     "
     Plugin 'jistr/vim-nerdtree-tabs'
     "Configure ctrlp
     set runtimepath^=~/.vim/bundle/ctrlp.vim
-
+    Plugin 'vim-airline/vim-airline'
+    Plugin 'vim-airline/vim-airline-themes'
 endif
 
 Plugin 'ap/vim-css-color'
@@ -42,8 +43,6 @@ Plugin 'vim-ruby/vim-ruby'
 Plugin 'peterhoeg/vim-qml'
 Plugin 'christoomey/vim-tmux-navigator'
 Plugin 'guns/vim-clojure-static'
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
 Plugin 'posva/vim-vue'
 
 " The sparkup vim script is in a subdirectory of this repo called vim.
@@ -144,7 +143,7 @@ set clipboard=unnamed
 set backspace=2
 "=================================== Detect QML Syntax ======================
 au BufNewFile,BufRead *.qml set filetype=qml
-"============================ Airline Config =================================
+"============================ Airline Config ================================
 let g:airline_powerline_fonts = 1 "git clone git@github.com:powerline/fonts.git
                                   "./install.sh
 let g:airline_theme = 'durant'
@@ -152,3 +151,5 @@ if !exists('g:airline_symbols')
       let g:airline_symbols = {}
   endif
 let g:airline_symbols.space = "\ua0"
+"========================  Enter insert mode terminals ======================
+autocmd BufEnter * if &buftype == 'terminal' | :startinsert | endif
diff --git a/.zshrc b/.zshrc
index 285b32f..4fc7b2a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -14,8 +14,6 @@ export EDITOR="/usr/local/bin/nvim"
 # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
 ZSH_THEME="refined"
 
-bindkey "^P" up-line-or-search
-
 # Set list of themes to load
 # Setting this variable when ZSH_THEME=random
 # cause zsh load theme from this variable instead of
@@ -95,6 +93,9 @@ source $ZSH/oh-my-zsh.sh
 
 # User configuration
 
+bindkey "^P" up-line-or-search
+setopt NO_NOMATCH
+
 # export MANPATH="/usr/local/man:$MANPATH"
 
 # You may need to manually set your language environment