diff --git a/autoload/macro_mode.vim b/autoload/macro_mode.vim
new file mode 100644
index 0000000..de12a5f
--- /dev/null
+++ b/autoload/macro_mode.vim
@@ -0,0 +1,7 @@
+function! macro_mode#enable()
+  nmap <CR> @@
+endfunction
+
+function! macro_mode#disable()
+  nunmap <CR>
+endfunction
diff --git a/plugin/functions.vim b/plugin/functions.vim
index f82bc2d..faf8aa1 100644
--- a/plugin/functions.vim
+++ b/plugin/functions.vim
@@ -80,3 +80,7 @@ function! <SID>TaskToggle()
 endfunction
 command! TaskToggle :call <SID>TaskToggle()
 nnoremap <leader>x :TaskToggle<CR>
+
+" {Dis,En}able macro mode, use <CR> to repeat last macro
+command! MacroModeEnable :call macro_mode#enable()
+command! MacroModeDisable :call macro_mode#disable()
diff --git a/plugin/mappings.vim b/plugin/mappings.vim
index ce940e8..63b4276 100644
--- a/plugin/mappings.vim
+++ b/plugin/mappings.vim
@@ -1,6 +1,3 @@
-" Make it easier to repeat macros
-nnoremap <CR> @@
-
 " YouCompleteMe
 nnoremap <leader>fi :YcmCompleter FixIt<CR>
 nnoremap <leader>gd :YcmCompleter GoTo<CR>
@@ -43,7 +40,7 @@ nnoremap <C-f>s :Snippets<CR>
 nnoremap j gj
 nnoremap k gk
 " Quick write
-map <leader>w :w!<CR>
+nnoremap <leader>w :w!<CR>
 
 " Switch panes
 nnoremap <C-h> <C-w>h
@@ -52,10 +49,10 @@ nnoremap <C-k> <C-w>k
 nnoremap <C-l> <C-w>l
 
 " Quick tabs
-nmap <leader>tn :tabnew<Space>
-nmap <leader>tc :tabclose<CR>
-nmap <leader>to :tabonly<CR>
-nmap <leader>tm :tabmove<Space>
+nnoremap <leader>tn :tabnew<Space>
+nnoremap <leader>tc :tabclose<CR>
+nnoremap <leader>to :tabonly<CR>
+nnoremap <leader>tm :tabmove<Space>
 
 " Clear search highlights
 map <leader><Space> :noh<CR>
@@ -65,7 +62,7 @@ map \hi :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") .
   \ '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
   \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
-" Quick clipboard yank/put
+" System clipboard yank/put
 map <leader>y "+y
 map <leader>Y "+Y
 map <leader>p "+p