diff --git a/lib/Projects.hs b/lib/Projects.hs
index f82fe34..c458b91 100644
--- a/lib/Projects.hs
+++ b/lib/Projects.hs
@@ -49,32 +49,37 @@ projects =
   , singleTermAppWithName "email" "neomutt"
   , Project { projectName = "admin"
             , projectDirectory = "~/admin/nixos-config"
-            , projectStartHook = Just $ do safeSpawn "vim" ["-g"]
+            , projectStartHook = Just $ do safeSpawn "emacsclient" ["-c"]
                                            safeSpawnProg term
             }
   , Project { projectName = "overlays-personal"
             , projectDirectory = "~/admin/overlays-personal"
-            , projectStartHook = Just $ do safeSpawn "vim" ["-g"]
+            , projectStartHook = Just $ do safeSpawn "emacsclient" ["-c"]
                                            safeSpawnProg term
             }
   , Project { projectName = "cdc-config"
             , projectDirectory = "~/admin/cdc-config"
-            , projectStartHook = Just $ do safeSpawn "vim" ["-g"]
+            , projectStartHook = Just $ do safeSpawn "emacsclient" ["-c"]
                                            safeSpawnProg term
             }
   , Project { projectName = "rukokuoppa"
             , projectDirectory = "~/candy/rukokuoppa"
-            , projectStartHook = Just $ do safeSpawn "vim" ["-g"]
+            , projectStartHook = Just $ do safeSpawn "emacsclient" ["-c"]
                                            safeSpawnProg term
             }
   , Project { projectName = "notes"
             , projectDirectory = "~/zk"
-            , projectStartHook = Just $ do safeSpawn "vim" ["-g"]
+            , projectStartHook = Just $ do safeSpawn "emacsclient" ["-c"]
                                            safeSpawnProg term
             }
   , Project { projectName = "xmonad"
             , projectDirectory = "~/.xmonad"
-            , projectStartHook = Just $ do safeSpawn "vim" ["-g"]
+            , projectStartHook = Just $ do safeSpawn "emacsclient" ["-c"]
+                                           safeSpawnProg term
+            }
+  , Project { projectName = "waymonad"
+            , projectDirectory = "~/candy/waymonad"
+            , projectStartHook = Just $ do safeSpawn "emacsclient" ["-c"]
                                            safeSpawnProg term
             }
   , Project { projectName = "accounting"