diff --git a/vim/configs/vimrc b/vim/configs/vimrc
index 0a5e0b1..6920db9 100644
--- a/vim/configs/vimrc
+++ b/vim/configs/vimrc
@@ -128,7 +128,7 @@ Plugin 'vim-scripts/BusyBee'
 Plugin 'nowk/genericdc'
 Plugin 'andrwb/vim-lapis256'
 Plugin 'glortho/feral-vim'
-Plugin 'thewatts/wattslandia'
+" Plugin 'thewatts/wattslandia'
 Plugin 'kristijanhusak/vim-hybrid-material'
 Plugin 'jscappini/material.vim'
 Plugin 'marcopaganini/termschool-vim-theme'
@@ -139,6 +139,7 @@ Plugin 'tyrannicaltoucan/vim-quantum'
 Plugin 'kamwitsta/nordisk'
 Plugin 'davidklsn/vim-sialoquent'
 Plugin 'trevordmiller/nova-vim'
+Plugin 'fenetikm/falcon'
 
 " Improved syntax files
 Plugin 'Glench/Vim-Jinja2-Syntax'
@@ -280,7 +281,7 @@ au FileType yaml setlocal expandtab tabstop=4 sw=4 sts=4 textwidth=0
 "  Remove tailing spaces
 " ----------------------------------------------------------------------
 
-autocmd FileType c,cpp,python,yang,json,yaml,javascript autocmd BufWritePre <buffer> :%s/\s\+$//e
+autocmd FileType c,cpp,python,yang,json,yaml,javascript,scala autocmd BufWritePre <buffer> :%s/\s\+$//e
 
 " ----------------------------------------------------------------------
 " mapings
@@ -333,6 +334,12 @@ else
 	imap <M-0> <ESC>:tabn 10<CR>a
 endif
 
+" Easy swtich between splits
+nnoremap <C-J> <C-W><C-J>
+nnoremap <C-K> <C-W><C-K>
+nnoremap <C-L> <C-W><C-L>
+nnoremap <C-H> <C-W><C-H>
+
 " ----------------------------------------------------------------------
 " Autopair settings
 " ----------------------------------------------------------------------
@@ -484,6 +491,11 @@ let g:clang_format#style_options = {
 vmap v <Plug>(expand_region_expand)
 vmap <C-v> <Plug>(expand_region_shrink)
 
+" ----------------------------------------------------------------------
+"   Special options for Python syntax
+" ----------------------------------------------------------------------
+let g:python_highlight_all = 1
+
 " ----------------------------------------------------------------------
 "  Lastly, load configurations available only to this computer
 " ----------------------------------------------------------------------