diff --git a/dot_xkb/symbols/us-escape-grave b/dot_xkb/symbols/us-escape-grave
new file mode 100644
index 0000000..2fb6781
--- /dev/null
+++ b/dot_xkb/symbols/us-escape-grave
@@ -0,0 +1,10 @@
+// Custom US layout with Caps Lock as Escape and Escape as Grave (`)
+
+xkb_symbols "basic" {
+	include "us(altgr-intl)"
+
+    name[Group1]="The best keyboard layout ever";
+
+    key <CAPS> { [ Escape ] };  // Remap Caps Lock to Escape
+    key <ESC>  { [ grave ] };   // Remap Escape to Grave (`)
+};
diff --git a/private_dot_config/doom/config.el b/private_dot_config/doom/config.el
index d7680f0..e0e1847 100644
--- a/private_dot_config/doom/config.el
+++ b/private_dot_config/doom/config.el
@@ -91,10 +91,9 @@
 
   (org-roam-capture-templates
    '(("d" "default" plain
-      (function org-roam-capture--get-point)
       "%?"
       :file-name "${slug}"     ;  <---------- see?
-      :head "#+title: ${title}\n#+created: %u\n#+last_modified: %U\n#+roam_tags:${tag}\n\n"
+      :target (file+head "${slug}.org" "#+title: ${title}\n")
       :unnarrowed t
       :immediate-finish t  :config)))
 
@@ -166,15 +165,7 @@
   ;; This way it just waits until you've been idle for a while to avoid disturbing
   ;; the user.
   (setq-default org-caldav-inbox nil)
-  (setq org-caldav-calendar-id "work")
-  ;; (defvar org-caldav-sync-timer nil
-  ;;    "Timer that `org-caldav-push-timer' used to reschedule itself, or nil.")
-  ;; (defun org-caldav-sync-with-delay (secs)
-  ;;   (when org-caldav-sync-timer
-  ;;     (cancel-timer org-caldav-sync-timer))
-  ;;   (setq org-caldav-sync-timer
-  ;; 	  (run-with-idle-timer
-  ;; 	   (* 1 secs) nil 'org-caldav-sync)))
+  (setq org-caldav-calendar-id nil)
 
   (setq org-caldav-files '("~/org/.archive/appointments.org"))
   ;; Actual calendar configuration edit this to meet your specific needs
@@ -191,13 +182,6 @@
       (:calendar-id "home"
       		    :files: ("~/org/home.org")
       		    :inbox "~/org/home.org")
-      ;; (:calendar-id "studies-1"
-      ;; 		    :files: ("~/org/studies.org")
-      ;; 		    :inbox "~/org/studies.org"
-      ;; 		    )
-      ;; (:calendar-id "some-day-1"
-      ;; 		    :files: ("~/org/.archive/someday.org")
-      ;; 		    :inbox "~/org/.archive/someday.org")
       ))
   (setq org-caldav-backup-file "~/org-caldav/org-caldav-backup.org")
   (setq org-caldav-save-directory "~/org-caldav/")
@@ -287,25 +271,6 @@
 	       '("l" "Someday" entry
 		 (file+headline "~/org/someday.org" "Inbox")
 		 "* TODO %? \n %i " :empty-lines 1) t)
-<<<<<<< HEAD
-=======
-  ;; (add-to-list 'org-capture-templates
-  ;; 	       '("s" "Studies" entry
-  ;; 		 (file+headline "~/org/studies.org" "Inbox")
-  ;; 		 "* TODO [#C] %?\n %i" :empty-lines 1) t)
-;;   (add-to-list 'org-capture-templates
-;; 	       '("S" "Lecture" entry
-;; 		 (file+headline "~/org/studies.org" "Schedule")
-;; 		 "* %^{Subject} %^{Type|Lecture|Section}
-;; :PROPERTIES:
-;; :WILD_NOTIFY_BEFORE: %^{Reminders}
-;; :LOCATION: %^{Location}
-;; :END:
-;; %^{Time}T"
-;;  		:empty-lines 1) t)
-  ;; add this for reminder stuff
-  ;; :PROPERTIES:\n\n:WILD_NOTIFY_BEFORE: %^{Reminders}\n:END:\n
->>>>>>> 430e06c7fd9cb312399d98d25820a5d3940e7ce7
   (add-to-list 'org-capture-templates
 	       '("W" "Event" entry
 		 (file+headline "~/org/work.org" "Schedule")
@@ -510,9 +475,7 @@
 (setq org-pomodoro-finished-sound "~/Music/yippee.wav")
 (setq org-pomodoro-short-break-sound "~/Music/shortbreak.wav")
 (setq org-pomodoro-long-break-sound "~/Music/longbreak.wav")
-(setq x-select-enable-clipboard-manager nil)
 (setq select-active-regions nil)
-(setq org-trello-files '("~/org/grad-trello.org"))
 (setq straight-disable-native-compile '("org-trello") )
 (setq org-agenda-span 'day)
 (setq org-agenda-start-day "-0d")
@@ -587,7 +550,7 @@
   	  (make-llm-ollama
   	   ;; this model should be pulled to use it
   	   ;; value should be the same as you print in terminal during pull
-  	   :chat-model "qwen2.5-coder:latest"
+  	   :chat-model "danielsheep/Qwen3-Coder-30B-A3B-Instruct-1M-Unsloth:UD-IQ3_XXS"
   	   :embedding-model "nomic-embed-text"
   	   :default-chat-non-standard-params '(("num_ctx" . 8192))))
   ;; (setopt ellama-summarization-provider
@@ -618,7 +581,7 @@
 	   :default-chat-non-standard-params
 	   '(("num_ctx" . 32768))))
   (setopt ellama-extraction-provider (make-llm-ollama
-  				      :chat-model "qwen2.5-coder:latest"
+  				      :chat-model "qwen2.5-coder:14b"
   				      :embedding-model "nomic-embed-text"
   				      :default-chat-non-standard-params
   				      '(("num_ctx" . 32768))))
@@ -634,7 +597,7 @@
   ;; handle scrolling events
   (advice-add 'pixel-scroll-precision :before #'ellama-disable-scroll)
   (advice-add 'end-of-buffer :after #'ellama-enable-scroll))
-
+;; ellama keybinds
 (map! :leader
  :nv "e" #'ellama
  )
@@ -648,4 +611,44 @@
 (after! org-babel
   (add-to-list 'org-src-lang-modes '("dot" . graphviz-dot))
   (setq org-src-lang-modes (remove '("dot" . fundamental) org-src-lang-modes))
+;; Setup xclip for wayland
+(after! xclip
+(setq xclip-program "wl-copy")
+(setq xclip-select-enable-clipboard t)
+(setq xclip-mode t)
+(setq xclip-method (quote wl-copy)))
+
+(setq +doom-dashboard-menu-sections
+ '(
+  ("Today's Note" :icon
+  (nerd-icons-faicon "nf-fa-file_text" :face 'doom-dashboard-menu-title) :action
+  org-roam-dailies-goto-today)
+  ("Go to Daily Note" :icon
+  (nerd-icons-faicon "nf-fa-file_text" :face 'doom-dashboard-menu-title) :action
+  org-roam-dailies-goto-date)
+  ("Open project" :icon
+   (nerd-icons-octicon "nf-oct-briefcase" :face 'doom-dashboard-menu-title)
+   :action projectile-switch-project)
+  ("Open Config" :icon
+  (nerd-icons-faicon "nf-fa-toolbox" :face 'doom-dashboard-menu-title) :action
+  chezmoi-find)
+  ("Telegram" :icon
+  (nerd-icons-faicon "nf-fa-telegram" :face 'doom-dashboard-menu-title) :action
+  telega)
+  ("EMAIL" :icon
+  (nerd-icons-faicon "nf-fa-fax" :face 'doom-dashboard-menu-title) :action
+  mu4e)
+  ("TETRIS?!" :icon
+  (nerd-icons-faicon "nf-fa-gamepad" :face 'doom-dashboard-menu-title) :action
+  tetris)
+  ("SNAAAAAAAAAAAAAAAAKEEEEEE" :icon
+  (nerd-icons-faicon "nf-fa-gamepad" :face 'doom-dashboard-menu-title) :action
+  snake)
+  )
+ )
+
+;; For capturing notes
+(map! :leader
+ :nv "N" #'org-roam-capture
+ :nv "D" #'org-roam-dailies-capture-today
 )
diff --git a/private_dot_config/doom/packages.el b/private_dot_config/doom/packages.el
index 58f0b07..6551bcf 100644
--- a/private_dot_config/doom/packages.el
+++ b/private_dot_config/doom/packages.el
@@ -77,3 +77,4 @@
 (package! ellama)
 (package! mpdel)
 (package! graphviz-dot-mode)
+(package! xclip)
diff --git a/private_dot_config/sway/config b/private_dot_config/sway/config
index 51e3b9e..7b55195 100644
--- a/private_dot_config/sway/config
+++ b/private_dot_config/sway/config
@@ -42,11 +42,11 @@ disable
 }
 output $main {
 mode 1920x1080@143.855Hz
-pos 1210 100
+pos 0 0
 }
 focus output $main
 output $second {
-resolution 1280x1024 pos 0 0
+resolution 1280x1024 pos 1920 0
 transform 270
 scale 0.85
 }
@@ -88,7 +88,7 @@ scale 0.85
 #
 # or input <identifier>
 input "type:keyboard" {
-	xkb_layout us,ara
+	xkb_layout us-escape-grave,ara
 	xkb_variant ,ergoarabic
 	xkb_options grp:alt_shift_toggle,compose:ralt,caps:escape
 }
diff --git a/private_dot_config/sway/config.d/misc.conf b/private_dot_config/sway/config.d/misc.conf
index ee78e2a..cb41516 100644
--- a/private_dot_config/sway/config.d/misc.conf
+++ b/private_dot_config/sway/config.d/misc.conf
@@ -1,5 +1,6 @@
 #The best hot key ever
 bindsym ctrl+$mod+v exec firefox https://www.youtube.com/watch?v=dQw4w9WgXcQ
+bindsym $mod+i exec emacsclient -nc
 # bindsym ctrl+$mods+b exec --no-startup-id ~/scripts/bing_chilling.sh
 #disable mouse binds
 #bindsym $mod+shift+a exec ~/scripts/mouse.sh -0.5 0
@@ -92,7 +93,7 @@ bindsym ctrl+shift+s exec --no-startup-id "obs-cmd trigger-hotkey ReplayBuffer.S
 
 # Volume Stuff
 exec_always wpctl set-volume @DEFAULT_AUDIO_SINK@ 90%
-exec_always wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 58%
+exec_always wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 52%
 
 #Sway Notif Center
 exec swaync
diff --git a/private_dot_config/sway/config.d/window_rules.conf b/private_dot_config/sway/config.d/window_rules.conf
index b081f87..249d3e9 100644
--- a/private_dot_config/sway/config.d/window_rules.conf
+++ b/private_dot_config/sway/config.d/window_rules.conf
@@ -25,6 +25,7 @@ for_window [title = "Mozilla Firefox (Private Browsing)"] move to workspace $Vm
 
 #Browsers
 assign [app_id = "firefox_firefox"] $Browsers
+assign [app_id = "zen"] $Browsers
 assign [class = "Microsoft-edge"] $Browsers
 assign [class = "Nemo"] $Browsers
 # assign [class ="Pavucontrol"] $Browsers
diff --git a/private_dot_local/private_share/private_applications/zen.desktop b/private_dot_local/private_share/private_applications/zen.desktop
new file mode 100644
index 0000000..a77b82c
--- /dev/null
+++ b/private_dot_local/private_share/private_applications/zen.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+
+# The type as listed above
+Type=Application
+
+
+# The name of the application
+Name=Zen
+
+# A comment which can/will be used as a tooltip
+Comment=Awesome Web browser
+
+
+# The executable of the application, possibly with arguments.
+Exec=zen
+
+# The name of the icon that will be used to display this entry
+Icon=/opt/zen/browser/chrome/icons/default/default128.png
+
+# Describes whether this application needs to be run in a terminal or not
+Terminal=false