diff --git a/.config/vim/vim_idea b/.config/vim/vim_idea
new file mode 100644
index 0000000..e69de29
diff --git a/.config/vim/vim_plug b/.config/vim/vim_plug
index 8a47004..9627fa4 100644
--- a/.config/vim/vim_plug
+++ b/.config/vim/vim_plug
@@ -100,7 +100,7 @@ Plug 'dense-analysis/ale'
 " --- For rust
 Plug 'rust-lang/rust.vim'
 
-Plug 'wakatime/vim-wakatime'
+" Plug 'wakatime/vim-wakatime'
 
 call plug#end()
 
diff --git a/.config/vim/vim_uni b/.config/vim/vim_uni
index 251dc5c..f592fa0 100644
--- a/.config/vim/vim_uni
+++ b/.config/vim/vim_uni
@@ -24,6 +24,7 @@ syntax on
 filetype indent plugin on
 map <C-n> :NERDTreeToggle<CR>
 let mapleader=" "
+set guifont=Iosevka:h15
 
 " ----- Folding stuff
 set foldnestmax=10
@@ -72,6 +73,9 @@ function! TwiddleCase(str)
 endfunction
 vnoremap ~ y:call setreg('', TwiddleCase(@"), getregtype(''))<CR>gv""Pgv
 
+" Format with by pressing Q useful for markdown / other markup languages
+map Q gq
+
 " ----- 'vim -b' = edit binary using xxd-format!
 augroup Binary
   au!
@@ -93,6 +97,7 @@ autocmd Filetype html set ai sw=4 ts=4 sta et fo=croql
 autocmd Filetype css set ai sw=4 ts=4 sta et fo=croql
 autocmd Filetype javascript set ai sw=4 ts=4 sta et fo=croql
 autocmd Filetype vue set ai sw=4 ts=4 sta et fo=croql
+autocmd Filetype php set ai sw=4 ts=4 sta et fo=croql
 
 " ----- Auto refresh vimrc
 augroup myvimrc
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index 9a654d7..88819e3 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -1,10 +1,11 @@
 #!/bin/zsh
 
+export JAVA_HOME="/usr/lib/jvm/java-8-openjdk"
 export ANDROID_SDK_ROOT="/opt/android-sdk"
 
 # -- Path
 # PATH="$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')${PATH:+:${PATH}}"
-PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')${PATH:+:${PATH}}"
+PATH="$HOME/.local/share/go/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')${PATH:+:${PATH}}"
 export RUST_SRC_PATH=$(rustc --print sysroot)/lib/rustlib/src/rust/library
 
 # -- IBus stuff (IME)
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index eb8ce31..da0de8d 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -49,4 +49,3 @@ source $ZSH_PLUGINS/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
 source $ZSH_PLUGINS/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh 2>/dev/null
 #source $ZSH_CUSTOM/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
 #source $ZSH_CUSTOM/plugins/fsh/fast-syntax-highlighting.plugin.zsh
-