gistfile1.diff

diff --git a/plugin/wildfire.vim b/plugin/wildfire.vim
index 5bfcd5a..3ed25b6 100644
--- a/plugin/wildfire.vim
+++ b/plugin/wildfire.vim
@@ -269,10 +269,15 @@ fu! s:safenet(count)
     return a:count
 endfu
 
-exe "nnoremap <silent> " . g:wildfire_fuel_map . " :<C-U>call <SID>Start(<SID>safenet(v:count1))<CR>"
-exe "vnoremap <silent> " . g:wildfire_fuel_map . " :<C-U>call <SID>Fuel(<SID>safenet(v:count1))<CR>"
-exe "vnoremap <silent> " . g:wildfire_water_map . " :<C-U>call <SID>Water()<CR>"
-
+nnoremap <silent> <Plug>(wildfire-fuel) :<C-U>call <SID>Start(<SID>safenet(v:count1))<CR>
+vnoremap <silent> <Plug>(wildfire-fuel) :<C-U>call <SID>Fuel(<SID>safenet(v:count1))<CR>
+vnoremap <silent> <Plug>(wildfire-water) :<C-U>call <SID>Water()<CR>
+
+if !hasmapto('<Plug>(wildfire-fuel)') && !hasmapto('<Plug>(wildfire-water)')
+  exe "nnoremap " . g:wildfire_fuel_map . " <Plug>(wildfire-fuel)"
+  exe "map" g:wildfire_fuel_map "<Plug>(wildfire-fuel)"
+  exe "map" g:wildfire_water_map "<Plug>(wildfire-water)"
+endif
 
 " Autocommands
 " =============================================================================