diff --git a/vim/shortcuts.vim b/vim/shortcuts.vim
index 3534b73..06ee6af 100644
--- a/vim/shortcuts.vim
+++ b/vim/shortcuts.vim
@@ -126,20 +126,9 @@ if g:uname ==? 'Darwin'
     "" Mac specific stuff
 elseif g:uname ==? 'Linux'
     "" Linux specific stuff
-    function! s:WaylandYank()
-        if v:event['regname'] ==# '+' || (v:event['regname'] ==# 'w' && s:plus_to_w)
-            call system('wl-copy', getreg(v:event['regname']))
-        endif
-    endfunction
-
-    " run s:WaylandYank() after every time text is yanked
-    augroup waylandyank
-        autocmd!
-        autocmd TextYankPost * call s:WaylandYank()
-    augroup END
-
+	xnoremap "+y y:call system("wl-copy", @")<cr>
     map "+p :<C-U>let @"=substitute(system('wl-paste --no-newline'), '<C-v><C-m>', '', 'g') \| exec 'normal! ' . v:count1 . 'p'<cr>
-    map "+P :<C-U>let @"=substitute(system('wl-paste --no-newline'), '<C-v><C-m>', '', 'g') \| exec 'normal! ' . v:count1 . 'P'<cr>
+    map "*p :<C-U>let @"=substitute(system('wl-paste --no-newline --primary'), '<C-v><C-m>', '', 'g') \| exec 'normal! ' . v:count1 . 'P'<cr>
 else
     "" Unknown platform
 endif
@@ -147,8 +136,7 @@ endif
 " Add shortcuts to yank/paste to unnamed/unnamedplus clipboards
 map <Leader>y "+y
 map <Leader>p "+P
-map <Leader>Y "+y
-map <Leader>P "+P
+map <Leader>P "*p
 map <Leader>yp <Plug>yankstack_substitute_older_paste
 map <leader>yn <Plug>yankstack_substitute_newer_paste