diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..3a248350
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "dotfiles/config/taffybar/taffybar"]
+	path = dotfiles/config/taffybar/taffybar
+	url = ../taffybar.git
+[submodule "dotfiles/xmonad/xmonad"]
+	path = dotfiles/xmonad/xmonad
+	url = ../xmonad.git
+[submodule "dotfiles/xmonad/xmonad-contrib"]
+	path = dotfiles/xmonad/xmonad-contrib
+	url = ../xmonad-contrib.git
diff --git a/dotfiles/config/karabiner/karabiner.json b/dotfiles/config/karabiner/karabiner.json
new file mode 100644
index 00000000..81286be4
--- /dev/null
+++ b/dotfiles/config/karabiner/karabiner.json
@@ -0,0 +1,106 @@
+{
+    "global": {
+        "check_for_updates_on_startup": true,
+        "show_in_menu_bar": true,
+        "show_profile_name_in_menu_bar": false
+    },
+    "profiles": [
+        {
+            "complex_modifications": {
+                "parameters": {
+                    "basic.to_if_alone_timeout_milliseconds": 1000
+                },
+                "rules": [
+                    {
+                        "manipulators": [
+                            {
+                                "description": "Change right command to command+control+option+shift.",
+                                "from": {
+                                    "key_code": "right_command",
+                                    "modifiers": {
+                                        "optional": [
+                                            "any"
+                                        ]
+                                    }
+                                },
+                                "to": [
+                                    {
+                                        "key_code": "left_shift",
+                                        "modifiers": [
+                                            "left_command",
+                                            "left_control",
+                                            "left_option"
+                                        ]
+                                    }
+                                ],
+                                "to_if_alone": [
+                                    {
+                                        "key_code": "escape",
+                                        "modifiers": {
+                                            "optional": [
+                                                "any"
+                                            ]
+                                        }
+                                    }
+                                ],
+                                "type": "basic"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "devices": [
+                {
+                    "disable_built_in_keyboard_if_exists": false,
+                    "fn_function_keys": {},
+                    "identifiers": {
+                        "is_keyboard": true,
+                        "is_pointing_device": false,
+                        "product_id": 610,
+                        "vendor_id": 1452
+                    },
+                    "ignore": false,
+                    "simple_modifications": {}
+                },
+                {
+                    "disable_built_in_keyboard_if_exists": false,
+                    "fn_function_keys": {},
+                    "identifiers": {
+                        "is_keyboard": true,
+                        "is_pointing_device": false,
+                        "product_id": 597,
+                        "vendor_id": 1452
+                    },
+                    "ignore": false,
+                    "simple_modifications": {}
+                }
+            ],
+            "fn_function_keys": {
+                "f1": "vk_consumer_brightness_down",
+                "f10": "mute",
+                "f11": "volume_down",
+                "f12": "volume_up",
+                "f2": "vk_consumer_brightness_up",
+                "f3": "vk_mission_control",
+                "f4": "vk_launchpad",
+                "f5": "vk_consumer_illumination_down",
+                "f6": "vk_consumer_illumination_up",
+                "f7": "vk_consumer_previous",
+                "f8": "vk_consumer_play",
+                "f9": "vk_consumer_next"
+            },
+            "name": "Default profile",
+            "one_to_many_mappings": {},
+            "selected": true,
+            "simple_modifications": {
+                "caps_lock": "left_control"
+            },
+            "standalone_keys": {},
+            "virtual_hid_keyboard": {
+                "caps_lock_delay_milliseconds": 0,
+                "keyboard_type": "ansi",
+                "standalone_keys_delay_milliseconds": 200
+            }
+        }
+    ]
+}
diff --git a/dotfiles/config/taffybar/imalison-taffybar.cabal b/dotfiles/config/taffybar/imalison-taffybar.cabal
index 269c7f08..dcb63a9e 100644
--- a/dotfiles/config/taffybar/imalison-taffybar.cabal
+++ b/dotfiles/config/taffybar/imalison-taffybar.cabal
@@ -24,6 +24,7 @@ executable imalison-taffybar
                      , split
                      , taffybar
                      , xmonad-contrib>=0.13
+                     , X11>=1.8
   default-language:    Haskell2010
 
 source-repository head
diff --git a/dotfiles/config/taffybar/stack.yaml b/dotfiles/config/taffybar/stack.yaml
index f94e0f3e..35b37ec9 100644
--- a/dotfiles/config/taffybar/stack.yaml
+++ b/dotfiles/config/taffybar/stack.yaml
@@ -2,9 +2,7 @@ flags: {}
 extra-package-dbs: []
 packages:
 - '.'
-- location:
-    git: git@github.com:IvanMalison/taffybar.git
-    commit: e779acfe8056e6dde10638e2f7e4ec77f92b9448
+- location: "./taffybar"
   extra-dep: true
 - location:
     git: git@github.com:willdonnelly/dyre.git
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
new file mode 160000
index 00000000..71900f6e
--- /dev/null
+++ b/dotfiles/config/taffybar/taffybar
@@ -0,0 +1 @@
+Subproject commit 71900f6e4f111360e31ce6d7d6b694274899f0af
diff --git a/dotfiles/config/taffybar/taffybar.rc b/dotfiles/config/taffybar/taffybar.rc
index e8e9684f..b2169afa 100644
--- a/dotfiles/config/taffybar/taffybar.rc
+++ b/dotfiles/config/taffybar/taffybar.rc
@@ -51,7 +51,7 @@ style "taffybar-icon-urgent" = "taffybar-default" {
 }
 
 style "taffybar-icon-active" = "taffybar-default" {
-  bg[NORMAL] = @dgrey
+  bg[NORMAL] = @lldgrey
 }
 
 style "taffybar-icon-minimized" = "taffybar-default" {
diff --git a/dotfiles/config/termite/config b/dotfiles/config/termite/config
index e86778fa..6f5c2929 100644
--- a/dotfiles/config/termite/config
+++ b/dotfiles/config/termite/config
@@ -1,3 +1,6 @@
+[options]
+dynamic_title = true
+
 [colors]
 # Base16 Default Dark
 # Author: Chris Kempson (http://chriskempson.com)
diff --git a/dotfiles/emacs.d/.gitignore b/dotfiles/emacs.d/.gitignore
index 2a148406..319cc27a 100644
--- a/dotfiles/emacs.d/.gitignore
+++ b/dotfiles/emacs.d/.gitignore
@@ -12,6 +12,7 @@ README.html
 ac-comphist.dat
 auto-save-list
 backups
+benchmark.el
 bookmarks
 custom-after.el
 custom-before.el
@@ -37,6 +38,7 @@ session.*
 skewer-cache
 smex-items
 speed-type/
+straight/
 this-machine.el
 tramp
 tutorial
diff --git a/dotfiles/emacs.d/.mc-lists.el b/dotfiles/emacs.d/.mc-lists.el
index 7165b675..1e00cb38 100644
--- a/dotfiles/emacs.d/.mc-lists.el
+++ b/dotfiles/emacs.d/.mc-lists.el
@@ -59,6 +59,7 @@
         handle-switch-frame
         helm-M-x
         ido-write-file
+        imalison:multiple-cursors-hydra/mc/edit-lines-and-exit
         isearch-delete-char
         smex
         yank-rectangle
diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 3fdab32a..b58c8328 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -1402,11 +1402,17 @@ Paradox is a package.el extension. I have no use for it now that I use straight.
 (use-package server
   :config
   (progn
+    (defun imalison:make-main-emacs-server ()
+      (interactive)
+      (when (not (equal server-name "server"))
+          (shell-command-to-string
+           (format "cd ~/.emacs.d/server/ && rm -f server && ln -s %s server" server-name))))
     (defun imalison:get-server-filepath ()
       (let ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)))
         (expand-file-name server-name server-dir)))
     (setq server-use-tcp t)
-    (unless (server-running-p) (server-start))))
+    (unless (server-running-p) (server-start))
+    (imalison:make-main-emacs-server)))
 #+END_SRC
 ** list-environment
 #+BEGIN_SRC emacs-lisp
@@ -2041,7 +2047,6 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
   :commands string-inflection-toggle
   :bind ("C-c l" . string-inflection-toggle))
 #+END_SRC
-
 ** yasnippet
 #+BEGIN_SRC emacs-lisp
 (use-package yasnippet
@@ -2788,6 +2793,11 @@ Intero seems to be causing hangs, so it has been disabled
                   ("M-," . pop-tag-mark)))
     (add-hook 'c-mode-common-hook 'imalison:cc-mode-hook)))
 #+END_SRC
+*** C--
+#+BEGIN_SRC emacs-lisp
+(use-package cmm-mode
+  :defer t)
+#+END_SRC
 *** C#
 #+BEGIN_SRC emacs-lisp
 (use-package csharp-mode
@@ -2835,6 +2845,7 @@ Intero seems to be causing hangs, so it has been disabled
 *** org
 **** config
 #+BEGIN_SRC emacs-lisp :tangle org-config.el
+(defvar imalison:org-dir "~/org")
 (use-package org
   :bind (:map org-mode-map
               (("C-e" . end-of-visual-line)))
@@ -3695,7 +3706,7 @@ I've disabled magithub because it causes magit to be super slow
   :disabled t
   :config
   (progn
-    (global-git-gutter -1)))
+    (global-git-gutter-mode +1)))
 #+END_SRC
 ** gitolite-clone
 #+BEGIN_SRC emacs-lisp
@@ -4713,7 +4724,7 @@ Ensure all themes that I use are installed:
     (setq solarized-high-contrast-mode-line t)))
 
 (defvar-setq packages-appearance
-  '(monokai-theme zenburn-theme base16-theme molokai-theme
+  '(monokai-theme zenburn-theme base16-theme molokai-theme moe-theme
                   tango-2-theme gotham-theme sublime-themes rainbow-delimiters
                   waher-theme ample-theme material-theme zerodark-theme
                   color-theme-modern leuven-theme spacemacs-theme gruvbox-theme
diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 8bd85aa5..a61290a2 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -10,12 +10,13 @@
       (eval-print-last-sexp)))
   (load bootstrap-file nil 'nomessage))
 
+(setq straight-vc-git-default-protocol 'ssh)
 (straight-use-package 'use-package)
 (require 'use-package)
 (setq use-package-enable-imenu-support t
 	  use-package-always-ensure t)
 
-(defvar imalison:do-benchmark)
+(defvar imalison:do-benchmark nil)
 
 (let ((bench-file (concat (file-name-directory user-init-file) "benchmark.el")))
   (when (file-exists-p bench-file) (load bench-file)))
diff --git a/dotfiles/xmonad/.gitignore b/dotfiles/xmonad/.gitignore
index ac62bcfa..4b2e4828 100644
--- a/dotfiles/xmonad/.gitignore
+++ b/dotfiles/xmonad/.gitignore
@@ -2,7 +2,6 @@
 /dist/
 /imalison-xmonad
 /taffybar
-/xmonad
 /xmonad-x86_64-linux
 /xmonad.errors
 /xmonad.hi
diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/xmonad/stack.yaml
index d1e8a34f..8aa1b5cf 100644
--- a/dotfiles/xmonad/stack.yaml
+++ b/dotfiles/xmonad/stack.yaml
@@ -1,22 +1,18 @@
 flags: {}
 extra-package-dbs: []
 packages:
-- '.'
-- location:
-    git: git@github.com:IvanMalison/xmonad.git
-    commit: 2e6312776bd277c775c32e35f9c763d3858e32a4
+- .
+- location: ./xmonad
   extra-dep: true
-- location:
-    git: git@github.com:IvanMalison/xmonad-contrib.git
-    commit: ad9c8001f6e2af7a87228c5feaf41aa230a639d5
+- location: ./xmonad-contrib
   extra-dep: true
-- location:
-    git: git@github.com:IvanMalison/taffybar.git
-    commit: 3570bdbd87a5464d7280d8750c5c153cf3dcc637
+- location: ./taffybar
   extra-dep: true
 extra-deps:
 - X11-xft-0.3.1
 - dbus-0.10.12
 - gtk-traymanager-0.1.6
 - libxml-sax-0.7.5
+- rate-limit-1.1.1
+- time-units-1.0.0
 resolver: lts-8.2
diff --git a/dotfiles/xmonad/xmonad b/dotfiles/xmonad/xmonad
new file mode 160000
index 00000000..2e631277
--- /dev/null
+++ b/dotfiles/xmonad/xmonad
@@ -0,0 +1 @@
+Subproject commit 2e6312776bd277c775c32e35f9c763d3858e32a4
diff --git a/dotfiles/xmonad/xmonad-contrib b/dotfiles/xmonad/xmonad-contrib
new file mode 160000
index 00000000..8bfb15b7
--- /dev/null
+++ b/dotfiles/xmonad/xmonad-contrib
@@ -0,0 +1 @@
+Subproject commit 8bfb15b709b8add0062aac6933414fb816526cd9
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index 6a35c37c..b4e20fdd 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -981,7 +981,6 @@ addKeys conf@XConfig { modMask = modm } =
     , ((hyper, xK_0), spawn "tvpower.js")
     , ((modalt, xK_z), spawn "split_chrome_tab_to_next_screen.sh")
     , ((hyper, xK_9), spawn "start_synergy.sh")
-    , ((hyper, xK_8), spawn "rofi_paswitch.sh")
     , ((hyper, xK_slash), spawn "toggle_taffybar.sh")
     , ((hyper, xK_space), spawn "skippy-xd")
     , ((hyper, xK_i), spawn "rofi_select_input.hs")
diff --git a/gen-gh-pages/compile.sh b/gen-gh-pages/compile.sh
index 5d1721ff..e7cae1ad 100755
--- a/gen-gh-pages/compile.sh
+++ b/gen-gh-pages/compile.sh
@@ -8,6 +8,7 @@ TARGET=$(readlink -f "$THIS_DIR/../dotfiles/emacs.d/README.org")
 git clone https://github.com/rejeep/evm.git "$HOME/.evm"
 evm config path /tmp
 evm install emacs-25.1-travis --use --skip
+export PATH="$HOME/.evm/bin:$PATH"
 
 curl -fsSkL https://raw.github.com/cask/cask/master/go | python
 
diff --git a/tasks/brewfiles/essential b/tasks/brewfiles/essential
index 7bb8415c..08936e06 100644
--- a/tasks/brewfiles/essential
+++ b/tasks/brewfiles/essential
@@ -1,4 +1,5 @@
 tap 'thoughtbot/formulae'
+tap 'caskroom/fonts'
 
 brew 'cask'
 brew 'coreutils'
@@ -11,6 +12,7 @@ brew 'gnutls'
 brew 'go'
 brew 'htop-osx'
 brew 'leiningen'
+brew 'pass'
 brew 'pyenv'
 brew 'rcm'
 brew 'rbenv'
@@ -21,16 +23,15 @@ brew 'tmux'
 brew 'wget'
 brew 'zsh'
 
+cask 'font-source-code-pro'
 cask 'alfred'
-cask 'flash'
 cask 'flycut'
 cask 'google-chrome'
 cask 'google-hangouts'
 cask 'gpgtools'
 cask 'iterm2'
 cask 'java'
-cask 'karabiner'
-cask 'macpass'
+cask 'karabiner-elements'
 cask 'slate'
 cask 'sparkleshare'
 cask 'spotify'
@@ -38,3 +39,4 @@ cask 'synergy'
 cask 'transmission'
 cask 'vlc'
 cask 'xquartz'
+cask 'font-source-code-pro'