diff --git a/files/.bashrc b/files/.bashrc
index 2966ddf..3a76206 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -27,6 +27,15 @@ alias rm='rm -i' # ask before removal
 alias cp='cp -i' # ask before removal
 alias mv='mv -i' # ask before removal
 
+# ============================== SSH-Agent
+if [ -f ~/.ssh/agent.env ]; then
+    . ~/.ssh/agent.env > /dev/null
+else
+    echo "Starting ssh-agent"
+    eval `ssh-agent | tee ~/.ssh/agent.env`
+    ssh-add
+fi
+
 if [ -f ~/.bashrc_local ]; then
     source ~/.bashrc_local
 fi
diff --git a/files/.xinitrc b/files/.xinitrc
index 412d85e..878b9a0 100755
--- a/files/.xinitrc
+++ b/files/.xinitrc
@@ -34,7 +34,7 @@ export XMODIFIERS='@im=fcitx'
 export WINIT_UNIX_BACKEND=x11
 
 # path
-export PATH=$PATH:$HOME/.cargo/bin:$HOME:/.local:$HOME/.cabal/bin:$HOME/.ghcup/bin
+export PATH=$PATH:$HOME/scripts:$HOME/.cargo/bin:$HOME/.cabal/bin:$HOME/.ghcup/bin
 
 # university wants me to use intellij, but dwm rightfully hates it
 export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/files/.zshrc b/files/.zshrc
index 6d9697a..35b2b55 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -47,8 +47,6 @@ zstyle ':vcs_info:git:*' formats '|%b '
 export EDITOR="nvim"
 export VISUAL="nvim"
 export LANG="en_US.UTF-8"
-# ~/.xinitrc holds rest of $PATH
-export PATH=$PATH:$HOME/.local/bin:$HOME/scripts
 
 # ============================== Aliases
 alias fontslist="fc-list :scalable=true:spacing=mono: family"
diff --git a/files/init.el b/files/init.el
index b085548..3da4ab2 100644
--- a/files/init.el
+++ b/files/init.el
@@ -210,26 +210,24 @@
 ;; org mode
 (use-package org
   :ensure t
-  ;; M-LEFT M-RIGHT deindent indent node
-  ;; M-UP M-DOWN move node up down
-  ;; Tab fold/unfold
-  ;; M-S-RET Insert new TODO
+  ;; C-c C-t org rotate
   :general
   (vim-leader-def 'normal 'global
-    "ohj" 'org-forward-heading-same-level ;; org header j"
-    "ohk" 'org-backward-heading-same-level ;; org header k
-    "or" 'org-meta-return ;; org return, insert new  entry
-    "otr" 'org-todo ;; org todo rotate
-    "opk" 'org-priority-up ;; org prio k
-    "opj" 'org-priority-down ;; org prip j
     "oci" 'org-clock-in
     "oco" 'org-clock-out
-    "oy"  'org-cycle) ;; Org-cYcle
+    "oa"  'org-agenda
+    "oca" 'org-capture)
   :config
   (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.5))
+  (setq org-agenda-files (quote ("~/data/nextcloud/org")))
+  (setq org-directory "~/data/nextcloud/org")
   :init
-  (setq org-todo-keywords '((sequence "TODO" "PROGRESS" "FEEDBACK" "|" "DONE" "DELEGATED")))
-  (setq org-log-done 'time))
+  (setq org-todo-keywords '((sequence "TODO" "PROGRESS" "|" "DONE")))
+  (setq org-log-done 'time)
+  (setq org-capture-templates
+	(quote (("j" "Japanese" entry (file "~/data/nextcloud/org/japanese.org") "* TODO %?\n")
+		("u" "University" entry (file "~/data/nextcloud/org/uni.org") "* TODO %?\n")
+		("p" "Personal" entry (file "~/data/nextcloud/org/personal.org") "* TODO %?\n")))))
 
 (use-package org-bullets
   :ensure t
@@ -456,7 +454,6 @@
 		 (push '("<=" . ?≤) prettify-symbols-alist)
                  (push '(">=" . ?≥) prettify-symbols-alist)))
 
-
 ;; Haskell
 (use-package haskell-mode
   :ensure t