diff --git a/config-min.org b/config-min.org
index 3e3803e..fdbf06e 100644
--- a/config-min.org
+++ b/config-min.org
@@ -872,6 +872,12 @@
     (tool-bar-mode -1)
     (menu-bar-mode -1)
     (scroll-bar-mode -1))
+
+  (when my/puppet-p
+    (tool-bar-add-item "left-arrow" #'previous-buffer 'puppet-previous-buffer)
+    (tool-bar-add-item "right-arrow" #'next-buffer 'puppet-next-buffer)
+    (tool-bar-add-item "saveas" #'org-save-all-org-buffers 'puppet-save))
+
   (fringe-mode '(10 . 10))
   ;; Need to configure all-the-icons so that mode-line doesn't look fat
   ;; and ugly
diff --git a/lisp/my-keymap.el b/lisp/my-keymap.el
index 5ca7bb6..e182f7a 100644
--- a/lisp/my-keymap.el
+++ b/lisp/my-keymap.el
@@ -92,4 +92,8 @@
               :before
               #'projectile-switch-switch-tab))
 
+(when my/puppet-p
+  (define-key *root-map* (kbd "C-x C-s") #'org-save-all-org-buffers)
+  (define-key *root-map* (kbd "C-f") #'next-buffer))
+
 (provide 'my-keymap)