diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..030d1ffb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+vim/.vim/bundle/local/
+tmux/.tmux/bundle/local/
+zsh/.zsh/bundle/local/
diff --git a/README.md b/README.md
index c0ce418a..1de6597a 100644
--- a/README.md
+++ b/README.md
@@ -48,17 +48,17 @@ $EDITOR ~/.zshrc.local
 $EDITOR ~/.tmux.conf.local
 ```
 
-To add your own Vim, Tmux or Zsh plugin you can just clone it to proper `bundle` directory:
+To add your own Vim, Tmux or Zsh plugin you can just clone it to proper `bundle/local` directory:
 
 ```shell
 # Add SuperTab vim plugin
-git clone git://github.com/ervandew/supertab ~/.vim/bundle/supertab
+git clone git://github.com/ervandew/supertab ~/.vim/bundle/local/supertab
 
 # Add Tmux sessionist plugin
-git clone git://github.com/tmux-plugins/tmux-sessionist ~/.tmux/bundle/tmux-sessionist
+git clone git://github.com/tmux-plugins/tmux-sessionist ~/.tmux/bundle/local/tmux-sessionist
 
 # Add zsh-autoenv zsh plugin
-git clone git://github.com/Tarrasch/zsh-autoenv ~/.zsh/bundle/zsh-autoenv
+git clone git://github.com/Tarrasch/zsh-autoenv ~/.zsh/bundle/local/zsh-autoenv
 ```
 
 ## Included stuff
@@ -66,16 +66,18 @@ git clone git://github.com/Tarrasch/zsh-autoenv ~/.zsh/bundle/zsh-autoenv
 ### Shell
  * [alias-tips](https://github.com/djui/alias-tips): A plugin to help remembering those aliases you defined once
  * [base-16-shell](https://github.com/chriskempson/base16-shell): A shell script to change your shell's default ANSI colors but most importantly, colors 17 to 21 of your shell's 256 colorspace (if supported by your terminal)
- * [cdls](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/cdls): Runs `ls -A` on directory change
+ * [cdls](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/cdls.plugin.zsh): Runs `ls -A` on directory change
  * [fzf](https://github.com/junegunn/fzf): A command-line fuzzy finder written in Go
- * [vi-mode](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/vi-mode): Enhanced Vi mode for zsh
+ * [globalias](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/globalias.plugin.zsh): Expands all glob
+   expressions, subcommands and aliases (including global)
+ * [vi-mode](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/vi-mode.plugin.zsh): Enhanced Vi mode for zsh
    with history substring search support
  * [zim](https://github.com/Eriner/zim): ZIM - Zsh IMproved
 
 ### Vim
  * [base16-vim](https://github.com/chriskempson/base16-vim): Base16 for Vim
  * [comittia.vim](https://github.com/rhysd/committia.vim): A Vim plugin for more pleasant editing on commit messages
- * [deoplete.nvim](https://github.com/Shougo/deoplete.nvim): 🌠 Dark powered asynchronous completion framework for neovim
+ * [completor.vim](https://github.com/maralla/completor.vim): Async completion framework made ease
  * [editorconfig-vim](https://github.com/editorconfig/editorconfig-vim): EditorConfig plugin for Vim
  * [fzf.vim](https://github.com/junegunn/fzf.vim): fzf :heart: vim
  * [syntastic](https://github.com/scrooloose/syntastic): Syntax checking hacks for vim
diff --git a/qutebrowser/.config/qutebrowser/qutebrowser.conf b/qutebrowser/.config/qutebrowser/qutebrowser.conf
index c87333f5..4425a371 100644
--- a/qutebrowser/.config/qutebrowser/qutebrowser.conf
+++ b/qutebrowser/.config/qutebrowser/qutebrowser.conf
@@ -922,7 +922,7 @@ cache-size =
 #     download button in the pdf.js viewer.
 #     Valid values: true, false
 #     Default: false
-allow-images = false
+allow-images = true
 allow-javascript = true
 allow-plugins = true
 webgl = true
diff --git a/vim/.vim/bundle/bundle b/vim/.vim/bundle/bundle
deleted file mode 120000
index a8357ec5..00000000
--- a/vim/.vim/bundle/bundle
+++ /dev/null
@@ -1 +0,0 @@
-../../../vim/.vim/bundle
\ No newline at end of file
diff --git a/vim/.vim/bundle/vim-tmux-navigator b/vim/.vim/bundle/vim-tmux-navigator
new file mode 120000
index 00000000..1cc6f855
--- /dev/null
+++ b/vim/.vim/bundle/vim-tmux-navigator
@@ -0,0 +1 @@
+../../../tmux/.tmux/bundle/vim-tmux-navigator
\ No newline at end of file
diff --git a/vim/.vimrc b/vim/.vimrc
index 45b1b4fc..94af88e2 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -46,7 +46,9 @@
   endif
 
   " Use system clipboard
-  set clipboard+=unnamedplus
+  if has("clipboard")
+    set clipboard=unnamedplus
+  endif
 
 " }}}
 
@@ -337,6 +339,7 @@
   set rtp+=~/.fzf
   runtime bundle/vim-pathogen/autoload/pathogen.vim
   execute pathogen#infect()
+  execute pathogen#infect('~/.vim/bundle/local/{}')
   execute pathogen#helptags()
 
   " If base16 theme is set from shell, load it
diff --git a/zsh/.profile b/zsh/.profile
index 8402d734..cd8ddeb5 100644
--- a/zsh/.profile
+++ b/zsh/.profile
@@ -16,5 +16,5 @@ export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
 
 # Preferred editor for local and remote sessions
-export EDITOR="nvim"
+export EDITOR="vim"
 export VISUAL="$EDITOR"
diff --git a/zsh/.zsh/bundle/cdls/cdls.plugin.zsh b/zsh/.zsh/bundle/cdls.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/cdls/cdls.plugin.zsh
rename to zsh/.zsh/bundle/cdls.plugin.zsh
diff --git a/zsh/.zsh/bundle/globalias.plugin.zsh b/zsh/.zsh/bundle/globalias.plugin.zsh
new file mode 100644
index 00000000..6a06d4ed
--- /dev/null
+++ b/zsh/.zsh/bundle/globalias.plugin.zsh
@@ -0,0 +1,18 @@
+globalias() {
+   zle _expand_alias
+   zle expand-word
+   zle self-insert
+}
+zle -N globalias
+
+# space expands all aliases, including global
+bindkey -M emacs " " globalias
+bindkey -M viins " " globalias
+
+# control-space to make a normal space
+bindkey -M emacs "^ " magic-space
+bindkey -M viins "^ " magic-space
+
+# normal space during searches
+bindkey -M isearch " " magic-space
+
diff --git a/zsh/.zsh/bundle/vi-mode/vi-mode.plugin.zsh b/zsh/.zsh/bundle/vi-mode.plugin.zsh
similarity index 100%
rename from zsh/.zsh/bundle/vi-mode/vi-mode.plugin.zsh
rename to zsh/.zsh/bundle/vi-mode.plugin.zsh