diff --git a/init.el b/init.el
index 1716a16..881da37 100644
--- a/init.el
+++ b/init.el
@@ -172,9 +172,22 @@
 
 
 ;; code-with-fun
+(global-undo-tree-mode)
+(evil-set-undo-system 'undo-tree)
+(use-package org-jira :ensure t
+  :config
+  (setq jiralib-url "https://coordinatr.thomann.de"))
 (use-package evil-org :ensure t
   :after org
   :hook (org-mode . (lambda () evil-org-mode)))
+(use-package org-roam
+      :ensure t
+      :init
+      (setq org-roam-v2-ack t)
+      :custom
+      (org-roam-directory (file-truename "~/Sync/RoamNotes"))
+      :config
+      (org-roam-db-autosync-mode))
 (use-package direnv :ensure t
   :config
   (direnv-mode))
@@ -372,6 +385,36 @@
     "fT"    'treemacs-find-file
     "f M-t" 'treemacs-find-tag
 
+    ;; Jira
+    "jpg" 'org-jira-get-projects
+    "jib" 'org-jira-browse-issue
+    "jig" 'org-jira-get-issues
+    "jij" 'org-jira-get-issues-from-custom-jql
+    "jih" 'org-jira-get-issues-headonly
+    "jiu" 'org-jira-update-issue
+    "jiw" 'org-jira-progress-issue
+    "jin" 'org-jira-progress-issue-next
+    "jia" 'org-jira-assign-issue
+    "jir" 'org-jira-refresh-issue
+    "jiR" 'org-jira-refresh-issues-in-buffer
+    "jic" 'org-jira-create-issue
+    "jik" 'org-jira-copy-current-issue-key
+    "jsc" 'org-jira-create-subtask
+    "jsg" 'org-jira-get-subtasks
+    "jcc" 'org-jira-add-comment
+    "jcu" 'org-jira-update-comment
+    "jwu" 'org-jira-update-worklogs-from-org-clocks
+    "jtj" 'org-jira-todo-to-jira
+    "jif" 'org-jira-get-issues-by-fixversion
+
+    ;; Roam
+    "rl" 'org-roam-buffer-toggle
+    "rf" 'org-roam-node-find
+    "rg" 'org-roam-graph
+    "ri" 'org-roam-node-insert
+    "rc" 'org-roam-capture
+    "rj" 'org-roam-dailies-capture-today
+
     ;; Window
     "w"           '(:ignore t :which-key "Window")
     "w="          'balance-windows-area