diff --git a/.vim/bundle/vim-go b/.vim/bundle/vim-go
index 8f11f67..da916cd 160000
--- a/.vim/bundle/vim-go
+++ b/.vim/bundle/vim-go
@@ -1 +1 @@
-Subproject commit 8f11f67bc8383f010f7cf8bd6490fdbeaa444f4e
+Subproject commit da916cdb7ba93f9776b7380c910488e18167fabd
diff --git a/.vim/bundle/vimwiki b/.vim/bundle/vimwiki
index 2afff4c..2c03d82 160000
--- a/.vim/bundle/vimwiki
+++ b/.vim/bundle/vimwiki
@@ -1 +1 @@
-Subproject commit 2afff4c411b5496a24e8f8698a4e01e5fc74d2df
+Subproject commit 2c03d82a0e4662adf1e347487d73a9bf4bf6fdac
diff --git a/.vim/bundle/webapi-vim b/.vim/bundle/webapi-vim
index dfc6063..a7789ab 160000
--- a/.vim/bundle/webapi-vim
+++ b/.vim/bundle/webapi-vim
@@ -1 +1 @@
-Subproject commit dfc60635e610f9200646a84d11887af9e3d50b10
+Subproject commit a7789abffe936db56e3152e23733847f94755753
diff --git a/home/.vimrc b/home/.vimrc
index 70a4418..fe291c7 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -27,6 +27,11 @@ syntax enable
 set background=dark
 set mouse=
 
+" Java settings
+let java_highlight_all=1
+let java_highlight_functions="style"
+let java_allow_cpp_keywords=1
+
 let g:airline_powerline_fonts = 1
 
 if filereadable(glob("./.vimrc.local"))