diff --git a/vim/config/bundles.vim b/vim/config/bundles.vim
index 793369b4..27d88b3f 100644
--- a/vim/config/bundles.vim
+++ b/vim/config/bundles.vim
@@ -27,10 +27,10 @@ NeoBundle 'altercation/vim-colors-solarized'
 NeoBundle 'cakebaker/scss-syntax.vim'
 NeoBundle 'christoomey/vim-tmux-navigator'
 NeoBundle 'editorconfig/editorconfig-vim'
-NeoBundle 'gcmt/wildfire.vim'
 NeoBundle 'haya14busa/incsearch.vim'
 NeoBundle 'itchyny/lightline.vim'
 NeoBundle 'justinmk/vim-sneak'
+NeoBundle 'mattn/emmet-vim/'
 NeoBundle 'moll/vim-node'
 NeoBundle 'scrooloose/syntastic'
 NeoBundle 'sheerun/vim-polyglot'
diff --git a/vim/config/plugins/emmet.vim b/vim/config/plugins/emmet.vim
new file mode 100644
index 00000000..d602857d
--- /dev/null
+++ b/vim/config/plugins/emmet.vim
@@ -0,0 +1,9 @@
+" Emmet config
+"======================================================================
+
+let g:user_emmet_mode = 'a' " enable in insert and visual mode
+let g:emmet_html5 = 0
+let g:user_emmet_install_global = 0
+let g:user_emmet_leader_key = '<C-e>'
+autocmd FileType html,php,scss,css EmmetInstall
+
diff --git a/vim/config/plugins/wildfire.vim b/vim/config/plugins/wildfire.vim
deleted file mode 100644
index 42b34a98..00000000
--- a/vim/config/plugins/wildfire.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-" wildfire -- selecting with enter/backspace
-"======================================================================
-
-let g:wildfire_objects = ['iw', 'iW', 'i"', "i\'", 'i)', 'i]', 'i}', 'i>', 'ip', 'it']
-let g:wildfire_fuel_map = "<ENTER>"
-let g:wildfire_water_map = "<BS>"
diff --git a/vimrc b/vimrc
index 6594e206..49ac7964 100644
--- a/vimrc
+++ b/vimrc
@@ -29,6 +29,7 @@ source ~/.vim/config/keymappings.vim
 source ~/.vim/config/leaderkeys.vim
 
 " and the configs and mappings for plugins loaded in bundles.vim
+source ~/.vim/config/plugins/emmet.vim
 source ~/.vim/config/plugins/fugitive.vim
 source ~/.vim/config/plugins/incsearch.vim
 source ~/.vim/config/plugins/lightline.vim
@@ -37,4 +38,3 @@ source ~/.vim/config/plugins/neosnippet.vim
 source ~/.vim/config/plugins/syntastic.vim
 source ~/.vim/config/plugins/unite.vim
 source ~/.vim/config/plugins/sneak.vim
-source ~/.vim/config/plugins/wildfire.vim