diff --git a/infra/libkookie/overlays/kookie/emacs/base/default.el b/infra/libkookie/overlays/kookie/emacs/base/default.el
index dda590c7f8b..c54996a97b0 100644
--- a/infra/libkookie/overlays/kookie/emacs/base/default.el
+++ b/infra/libkookie/overlays/kookie/emacs/base/default.el
@@ -26,7 +26,6 @@
 (defvaralias 'cperl-indent-level 'tab-width)
 
 ;;; Hide startup splash
-;; FIXME: this doesn't currently work...
 (setq inhibit-startup-screen t)
 (setq inhibit-splash-screen t)
 (setq initial-scratch-message nil)
@@ -64,13 +63,16 @@
 (add-hook 'find-file-hook (lambda () (ruler-mode 1)))
 
 ;;; Setup mitosis buffer splitting
-(setq emacs-anchor default-directory)
-(defun mitosis () (interactive) (make-frame))
+(defalias 'mitosis 'make-frame)
 
 ;;; Distraction free mode and minimap
 (require 'sublimity)
 (require 'sublimity-attractive)
 
+;;; Use the modeline from spacemacs
+(require 'spaceline-config)
+(spaceline-spacemacs-theme)
+
 ;;; OpenSCAD mode
 (add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode))
 
@@ -139,4 +141,7 @@
 (global-set-key (kbd "C-<prior>") 'previous-user-buffer)
 (global-set-key (kbd "M-s M-s") 'save-buffer)
 (global-set-key (kbd "C-t") 'smex)
-
+(global-set-key (kbd "C-H-<left>") 'centaur-tabs-backward-tab)
+(global-set-key (kbd "C-H-<right>") 'centaur-tabs-forward-tab)
+(global-set-key (kbd "C-H-<up>") 'next-window-any-frame)
+(global-set-key (kbd "C-H-<down>") 'previous-window-any-frame)
diff --git a/infra/libkookie/overlays/kookie/emacs/base/default.nix b/infra/libkookie/overlays/kookie/emacs/base/default.nix
index 78f27bb493b..7db532946d1 100644
--- a/infra/libkookie/overlays/kookie/emacs/base/default.nix
+++ b/infra/libkookie/overlays/kookie/emacs/base/default.nix
@@ -6,4 +6,5 @@ with epkgs;
   direnv
   smex
   sublimity
+  spaceline
 ])
diff --git a/infra/libkookie/overlays/kookie/emacs/default.nix b/infra/libkookie/overlays/kookie/emacs/default.nix
index de2d2035ec8..a40b6359906 100644
--- a/infra/libkookie/overlays/kookie/emacs/default.nix
+++ b/infra/libkookie/overlays/kookie/emacs/default.nix
@@ -34,7 +34,7 @@ pkgs.emacsWithPackages (epkgs:
       protobuf-mode
       raku-mode
       scad-mode
-
+      
       # Utility moduse
       fzf
       magit
@@ -44,4 +44,3 @@ pkgs.emacsWithPackages (epkgs:
       vterm
       which-key
     ])
-
diff --git a/infra/libkookie/overlays/kookie/emacs/org/default.el b/infra/libkookie/overlays/kookie/emacs/org/default.el
index b2c3a3b21a2..75cbb7e0a41 100644
--- a/infra/libkookie/overlays/kookie/emacs/org/default.el
+++ b/infra/libkookie/overlays/kookie/emacs/org/default.el
@@ -8,11 +8,18 @@
 ;; LIBKOOKIE is licensed under the GPL-3.0 (or later) -- see LICENSE
 
 (provide 'kookie-org)
+
+;;; Setup org-roam basics
 (require 'org)
 (require 'ox-reveal)
-
 (load-library "ox-reveal")
 
+;;; Setup org-roam mode
+(setq org-roam-v2-ack t)
+(require 'org-roam)
+(require 'org-roam-ui)
+
+
 ;;; Set .org as my file ending of choice
 (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
 
diff --git a/infra/libkookie/overlays/kookie/emacs/org/default.nix b/infra/libkookie/overlays/kookie/emacs/org/default.nix
index 1956e63705a..07fde68bda3 100644
--- a/infra/libkookie/overlays/kookie/emacs/org/default.nix
+++ b/infra/libkookie/overlays/kookie/emacs/org/default.nix
@@ -1,4 +1,10 @@
 { buildModule, epkgs, pkgs }:
 
 with epkgs; with pkgs;
-(buildModule "kookie-org" ./. [ org ox-reveal htmlize ])
+(buildModule "kookie-org" ./. [
+  org
+  org-roam
+  org-roam-ui
+  ox-reveal
+  htmlize
+])
diff --git a/infra/libkookie/overlays/kookie/emacs/rust/default.nix b/infra/libkookie/overlays/kookie/emacs/rust/default.nix
index 5a60e0ffac4..7249b7c0472 100644
--- a/infra/libkookie/overlays/kookie/emacs/rust/default.nix
+++ b/infra/libkookie/overlays/kookie/emacs/rust/default.nix
@@ -7,9 +7,6 @@ with epkgs; with pkgs;
   # lsp integration
   lsp-mode lsp-ui company
 
-  # ??? Not sure why these are required
-  dash-functional spinner
-
   # projectile mode
   projectile