diff --git a/emacs/.emacs.d/config/init-email.el b/emacs/.emacs.d/config/init-email.el
index 009cc21..a287c9c 100644
--- a/emacs/.emacs.d/config/init-email.el
+++ b/emacs/.emacs.d/config/init-email.el
@@ -161,6 +161,13 @@
     "j" #'mu4e-search-maildir
     "m" #'mu4e-search-matching)
 
+  (general-def mu4e-headers-mode-map
+    "s" mu4e-search-map)
+
+  (general-def mu4e-view-mode-map
+    "s" mu4e-search-map)
+
+
   (add-hook 'mu4e-compose-pre-hook
             (lambda ()
               (set
@@ -490,12 +497,17 @@ If given prefix arg ARG, skips markdown conversion."
 	  (if (< (line-end-position) end)
 	      (forward-line 1)
 	    (goto-char end))))))
-  :general
-  (normal mu4e-headers-mode-map
-          "t" #'mu4e-headers-mark-thread
-          "s" mu4e-search-map)
-  (normal mu4e-view-mode-map
-          "t" #'mu4e-view-mark-thread
-          "s" mu4e-search-map))
+  ;; there's some conflict with evil-collection making my keybindings
+  ;; not load, so load them in a hook
+  (defun my-mu4e-headers-mode-setup ()
+    (general-def normal mu4e-headers-mode-map
+      "t" #'mu4e-headers-mark-thread
+      "s" mu4e-search-map))
+  (defun my-mu4e-view-mode-setup ()
+    (general-def normal mu4e-view-mode-map
+      "t" #'mu4e-view-mark-thread
+      "s" mu4e-search-map))
+  (add-hook 'mu4e-headers-mode-hook #'my-mu4e-headers-mode-setup)
+  (add-hook 'mu4e-view-mode-hook #'my-mu4e-view-mode-setup))
 
 (provide 'init-email)
diff --git a/emacs/.emacs.d/config/init-java.el b/emacs/.emacs.d/config/init-java.el
index 3d70eb5..ceb0890 100644
--- a/emacs/.emacs.d/config/init-java.el
+++ b/emacs/.emacs.d/config/init-java.el
@@ -11,4 +11,7 @@
 
 (use-package protobuf-mode)
 
+(use-package jenv
+  :hook ((after-init . global-jenv-mode)))
+
 (provide 'init-java)
diff --git a/emacs/.emacs.d/config/init-org.el b/emacs/.emacs.d/config/init-org.el
index 406128e..9475735 100644
--- a/emacs/.emacs.d/config/init-org.el
+++ b/emacs/.emacs.d/config/init-org.el
@@ -28,6 +28,9 @@
                         (format-time-string "%Y-%m-%d")))
         (newline))
       (goto-char (point-max))))
+  (org-babel-do-load-languages
+   'org-babel-load-languages
+   '((plantuml . t)))
   :custom
   (org-modules '(ol-doi
                  ol-w3m
@@ -76,6 +79,8 @@
                    ("\\.pdf\\'" . emacs)
                    ("\\.mm\\'" . default)
                    ("\\.x?html?\\'" . default)))
+  (org-plantuml-exec-mode 'jar)
+  (org-plantuml-jar-path (expand-file-name "~/plantuml/plantuml.jar"))
   :general
   (leader-map "oa" #'org-agenda)
   (leader-map "oc" #'org-capture)
diff --git a/emacs/.emacs.d/config/init-plantuml.el b/emacs/.emacs.d/config/init-plantuml.el
index 83cceff..a9414b3 100644
--- a/emacs/.emacs.d/config/init-plantuml.el
+++ b/emacs/.emacs.d/config/init-plantuml.el
@@ -1,9 +1,10 @@
 ;; -*- lexical-binding: t; -*-
 (use-package plantuml-mode
   :mode (("\\.uml\\'" . plantuml-mode)
-         ("\\.plantuml\\'" .  plantuml-mode))
+         ("\\.plantuml\\'" .  plantuml-mode)
+         ("\\.puml\\'" . plantuml-mode))
   :custom
-  (plantuml-default-exec-mode 'executable)
-  (plantuml-executable-path (executable-find "plantuml")))
+  (plantuml-default-exec-mode 'jar)
+  (plantuml-jar-path (expand-file-name "~/plantuml/plantuml.jar")))
 
 (provide 'init-plantuml)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index ae2c923..5ba7644 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -3,6 +3,11 @@
 typeset -U path
 path=(~/bin ~/.local/bin ~/.gem/ruby/2.6.0/bin ~/go/bin /opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/bin /opt/homebrew/opt/ruby/bin /opt/local/bin /usr/local/opt/make/libexec/gnubin /opt/homebrew/opt/coreutils/libexec/gnubin $path)
 
+if type jenv &>/dev/null; then
+    export PATH="$HOME/.jenv/bin:$PATH"
+    eval "$(jenv init -)"
+fi
+
 # zsh-completions homebrew package
 if type brew &>/dev/null; then
     FPATH=$(brew --prefix)/share/zsh-completions:$FPATH