diff --git a/.config/i3/config b/.config/i3/config
index d3f6f11..c524c26 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -164,7 +164,7 @@ client.focused_inactive #333333 #222222 #888888 #292d2e #eeeeee
 client.unfocused #333333 #222222 #888888 #292d2e #eeeeee
 
 # Startup Applications
-exec --no-startup-id "$HOME/.screenlayout/layout.sh"
+exec --no-startup-id "$HOME/.screenlayout/launch.sh"
 exec --no-startup-id "xmodmap $HOME/.Xmodmap"
 exec --no-startup-id "polybar"
 exec --no-startup-id "lxpolkit &"
@@ -172,4 +172,3 @@ exec --no-startup-id "lxpolkit &"
 # Tweak keyboard and trackpad
 exec --no-startup-id "synclient VertEdgeScroll=1 VertScrollDelta=-111"
 exec --no-startup-id "setxkbmap -option caps:escape"
-exec --no-startup-id "nitrogen --restore &"
\ No newline at end of file
diff --git a/.emacs.d/config.org b/.emacs.d/config.org
index 46f476a..a95a18c 100644
--- a/.emacs.d/config.org
+++ b/.emacs.d/config.org
@@ -618,34 +618,42 @@ Visual fill column is a package that allows you to center text and add borders t
 Org-roam is a plain-text knowledge management system. It brings some of Roam's more powerful features into the Org-mode ecosystem such as org-file linking, etc.
 
 #+begin_src emacs-lisp
-  (use-package org-roam
-    :ensure t
-    :defer
-    :custom
-    (org-roam-directory "~/Notes")
-    :bind (("C-c n l" . org-roam-buffer-toggle)
-           ("C-c n f" . org-roam-node-find)
-           ("C-c n g" . org-roam-graph)
-           ("C-c n i" . org-roam-node-insert)
-           ("C-c n c" . org-roam-capture)
-           ;; Dailies
-           ("C-c n j" . org-roam-dailies-capture-today))
-    :config
-    ;; If you're using a vertical completion framework, you might want a more informative completion interface
-    (setq org-roam-capture-templates
-          '(("d" "default" plain "%?"
-             :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n")
-             :unnarrowed t)
-            ("p" "Project" plain
-             (file "~/Notes/Templates/Project.org")
-             :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n")
-             :unnarrowed t)
-            ("s" "Malware Sample" plain
-             (file "~/Notes/Templates/Sample.org")
-             :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n")
-             :unnarrowed t)))
-    (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
-    (org-roam-db-autosync-mode))
+(setq jm/org-roam-directory "~/Notes")
+(unless (file-directory-p jm/org-roam-directory)
+  (make-directory jm/org-roam-directory))
+
+(use-package org-roam
+  :ensure t
+  :defer
+  :custom
+  (org-roam-directory jm/org-roam-directory)
+  :bind (("C-c n l" . org-roam-buffer-toggle)
+         ("C-c n f" . org-roam-node-find)
+         ("C-c n g" . org-roam-graph)
+         ("C-c n i" . org-roam-node-insert)
+         ("C-c n c" . org-roam-capture)
+         ;; Dailies
+         ("C-c n j" . org-roam-dailies-capture-today))
+  :config
+  ;; If you're using a vertical completion framework, you might want a more informative completion interface
+  (setq org-roam-capture-templates
+        '(("d" "default" plain "%?"
+           :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n")
+           :unnarrowed t)
+          ("p" "Project" plain
+           (file "~/Notes/Templates/Project.org")
+           :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n")
+           :unnarrowed t)
+          ("a" "Article" plain
+           (file "~/Notes/Templates/Article.org")
+           :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n")
+           :unnarrowed t)
+          ("m" "Malware Sample" plain
+           (file "~/Notes/Templates/Malware.org")
+           :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n")
+           :unnarrowed t)))
+  (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
+  (org-roam-db-autosync-mode))
 #+end_src
 
 ** Fix Snippets
diff --git a/.screenlayout/launch.sh b/.screenlayout/launch.sh
index 416bad6..b10187f 100755
--- a/.screenlayout/launch.sh
+++ b/.screenlayout/launch.sh
@@ -1,2 +1,9 @@
-#!/bin/sh
-xrandr --output DP-1 --off --output DP-2 --primary --mode 3440x1440 --pos 2560x0 --rotate normal --output HDMI-1 --mode 2560x1080 --pos 0x647 --rotate normal --output DP-3 --off
+#!/bin/bash
+
+script="$HOME/.screenlayout/layout.sh"
+
+if [ -f "$script" ]; then
+   $script
+fi
+
+nitrogen --restore