@@ -12,8 +12,17 @@ emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
     diminish
     bind-key
     use-package
-    smartparens
   ]) ++ (with epkgs.melpaPackages; [
+    spacemacs-theme
+    evil
+    evil-commentary
+    evil-goggles
+    evil-mu4e
+    evil-org
+    evil-surround
+    evil-leader
+    evil-space
+
     ace-link
     ace-window
     add-node-modules-path
@@ -108,7 +117,6 @@ restclient
     ripgrep
     rjsx-mode
     php-mode
-    # prog-fill
     scala-mode
     scss-mode
     shrink-whitespace
@@ -123,11 +131,8 @@ toml-mode
     typescript-mode
     undo-tree
     visual-regexp
-    volatile-highlights
     web-mode
-    # monotropic-theme
-    eink-theme
-    white-theme
+    monotropic-theme
     wgrep-ag
     which-key
     yaml-mode