diff --git a/dotfiles/config/systemd/user/keybase.service b/dotfiles/config/systemd/user/keybase.service
index c27fbf8a..fe30c2bb 100644
--- a/dotfiles/config/systemd/user/keybase.service
+++ b/dotfiles/config/systemd/user/keybase.service
@@ -4,9 +4,9 @@ Wants=taffybar.service
 After=taffybar.service
 
 [Service]
-Type=simple
+Type=forking
 ExecStart=/usr/bin/env run_keybase
-ExecStop=/usr/bin/pkill Keybase
+PIDFile=$XDG_RUNTIME_DIR/keybase/keybased.pid
 
 [Install]
 WantedBy=wm.target
diff --git a/dotfiles/config/xmonad/ChangeLog.md b/dotfiles/config/xmonad/ChangeLog.md
deleted file mode 100644
index 27455813..00000000
--- a/dotfiles/config/xmonad/ChangeLog.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Revision history for imalison-xmonad
-
-## 0.1.0.0  -- YYYY-mm-dd
-
-* First version. Released on an unsuspecting world.
diff --git a/dotfiles/config/xmonad/Setup.hs b/dotfiles/config/xmonad/Setup.hs
deleted file mode 100644
index 9a994af6..00000000
--- a/dotfiles/config/xmonad/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/dotfiles/config/xmonad/imalison-xmonad.cabal b/dotfiles/config/xmonad/imalison-xmonad.cabal
index 8d83aaba..f35c9100 100644
--- a/dotfiles/config/xmonad/imalison-xmonad.cabal
+++ b/dotfiles/config/xmonad/imalison-xmonad.cabal
@@ -1,14 +1,13 @@
 name:                imalison-xmonad
 version:             0.1.0.0
 synopsis:            Ivan Malison's xmonad configuration.
-homepage:            https://github.com/IvanMalison/dotfiles/tree/master/dotfiles/xmonad
+homepage:            https://github.com/IvanMalison/dotfiles/tree/master/dotfiles/config/xmonad
 license:             GPL-3
 license-file:        LICENSE
 author:              Ivan Malison
 maintainer:          IvanMalison@gmail.com
 category:            System
 build-type:          Simple
-extra-source-files:  ChangeLog.md
 cabal-version:       >=1.10
 
 executable imalison-xmonad
diff --git a/dotfiles/emacs.d/.mc-lists.el b/dotfiles/emacs.d/.mc-lists.el
index 0f98f367..343db035 100644
--- a/dotfiles/emacs.d/.mc-lists.el
+++ b/dotfiles/emacs.d/.mc-lists.el
@@ -62,6 +62,7 @@
         handle-switch-frame
         helm-M-x
         ido-write-file
+        imalison:multiple-cursors-hydra/body
         imalison:multiple-cursors-hydra/mc/edit-lines-and-exit
         imalison:multiple-cursors-hydra/mc/mark-all-like-this-and-exit
         imalison:multiple-cursors-hydra/mc/mark-next-like-this