diff --git a/evil-collection-lispy.el b/evil-collection-lispy.el
index fe6c269..70e1280 100644
--- a/evil-collection-lispy.el
+++ b/evil-collection-lispy.el
@@ -152,43 +152,31 @@
 
 (defvar evil-collection-lispy-mode-map-evil
   (let ((map (copy-keymap lispy-mode-map-base)))
-    (define-key map (kbd "M-)") 'lispy-close-round-and-newline)
-    (define-key map (kbd "[") 'lispy-open-square)
-    (define-key map (kbd "]") 'lispy-close-square)
-    (define-key map (kbd "{") 'lispy-open-curly)
-    (define-key map (kbd "}") 'lispy-close-curly)
-    (define-key map (kbd ")") 'lispy-right-nostring)
-    (define-key map (kbd "\"") 'lispy-doublequote)
-    (define-key map (kbd "M-\"") 'lispy-meta-doublequote)
-    (define-key map (kbd "DEL") 'lispy-backward-delete)
+    (define-key map (kbd "M-)") 'lispy-wrap-round)
     (define-key map (kbd "M-s") 'lispy-splice)
     (define-key map (kbd "M-<up>") 'lispy-splice-sexp-killing-backward)
     (define-key map (kbd "M-<down>") 'lispy-splice-sexp-killing-backward)
     (define-key map (kbd "M-r") 'lispy-raise-sexp)
-    (define-key map (kbd "M-?") 'lispy-convolute-sexp)
+    (define-key map (kbd "M-C") 'lispy-convolute-sexp)
     (define-key map (kbd "M-S") 'lispy-split)
     (define-key map (kbd "M-J") 'lispy-join)
-    (define-key map (kbd "{") 'lispy-braces)
-    (define-key map (kbd "}") 'lispy-brackets)
     (define-key map (kbd "]") 'lispy-forward)
     (define-key map (kbd "[") 'lispy-backward)
-    (define-key map (kbd "M-(") 'evil-cp-wrap-next-round)
-    (define-key map (kbd "M-{") 'evil-cp-wrap-next-curly)
-    (define-key map (kbd "M-}") 'evil-cp-wrap-next-square)
-    (define-key map (kbd "<") 'evil-cp-<)
-    (define-key map (kbd ">") 'evil-cp->)
-    (define-key map (kbd "y") 'lispy-new-copy)
+    (define-key map (kbd "M-(") 'lispy-wrap-round)
+    (define-key map (kbd "M-{") 'lispy-wrap-braces)
+    (define-key map (kbd "M-}") 'lispy-wrap-braces)
+    (define-key map (kbd "<") 'lispy-slurp-or-barf-left)
+    (define-key map (kbd ">") 'lispy-slurp-or-barf-right)
+    (define-key map (kbd "M-y") 'lispy-new-copy)
     (define-key map (kbd "<C-return>") 'lispy-open-line)
     (define-key map (kbd "<M-return>") 'lispy-meta-return)
     (define-key map (kbd "M-k") 'lispy-move-up)
     (define-key map (kbd "M-j") 'lispy-move-down)
     (define-key map (kbd "M-o") 'lispy-string-oneline)
     (define-key map (kbd "M-p") 'lispy-clone)
-    (define-key map (kbd "M-\"") 'paredit-meta-doublequote)
+    (define-key map (kbd "M-d") 'lispy-delete)
     map)
-  "`evil' flavored `lispy-mode' bindings.
-
-For now, this is an exact copy of `lispy-mode-map-evil-cp'.")
+  "`evil' flavored `lispy-mode' bindings.")
 
 (defun evil-collection-lispy-set-key-theme (theme)
   "Set `lispy-mode-map' for according to THEME.