diff --git a/README.org b/README.org
index e9ece5fd..a2b86373 100644
--- a/README.org
+++ b/README.org
@@ -16,6 +16,7 @@
   - [[#completion][Completion]]
   - [[#yasnippet][YASnippet]]
   - [[#projectile][Projectile]]
+  - [[#httpd][HTTPD]]
   - [[#navigation][Navigation]]
   - [[#window-management][Window Management]]
   - [[#help][Help]]
@@ -617,6 +618,9 @@ This is similar but using mini-frame. Mini-frame works well, but not if using ex
     (apply f args)))
 #+END_SRC
 
+*** VERTICO
+Vertico is an alternative to Selectrum. Maybe using it will give me an even better experience over selectrum.
+
 *** CONSULT
 Consult has a lot of nice functions like Ivy's Counsel functions (enhanced searching functions), lets set some of them in the keymap so they are easily used.
 #+begin_src emacs-lisp
@@ -630,7 +634,8 @@ Consult has a lot of nice functions like Ivy's Counsel functions (enhanced searc
     :keymaps 'override
     "si" 'consult-imenu
     "so" 'consult-org-heading
-    "sm" 'bookmark-jump))
+    "sm" 'bookmark-jump
+    "sy" 'consult-yank-from-kill-ring))
 #+end_src
 
 *** MARGINALIA
@@ -703,6 +708,13 @@ I'm going to use projectile to keep my projects inline.
 (use-package projectile)
 #+end_src
 
+** HTTPD
+In order to view created websites, I'll use =simple-httpd= to get a web server running in emacs for preview.
+#+BEGIN_SRC emacs-lisp
+(use-package simple-httpd
+  :ensure t)
+#+END_SRC
+
 ** Navigation
 *** Avy
 Avy provides a lot of functions to search through the current buffer. Most of the time I use evil or consult functions to find what I'm looking for, but avy provides a lot of small movements that are more useful for visible movements.
@@ -826,7 +838,7 @@ LSP is useful...
 (use-package lsp-ui
   :hook (lsp-mode . lsp-ui-mode)
   :custom
-  (lsp-ui-doc-position 'top))
+  (lsp-ui-doc-position 'at-point))
 
 (use-package lsp-treemacs
   :after lsp)
@@ -1143,7 +1155,8 @@ Part of this config includes some special capture templates for my work as a you
           ("oc" "Project changelog" entry #'+org-capture-central-project-changelog-file
            "* %U %?\n %i\n %a" :heading "Changelog" :prepend t))
         org-capture-use-agenda-date t
-        org-agenda-timegrid-use-ampm t)
+        org-agenda-timegrid-use-ampm t
+        org-agenda-tags-column -100)
 
   (setq org-imenu-depth 4
         org-odt-styles-file "/home/chris/org/style.odt"
@@ -1219,7 +1232,7 @@ Part of this config includes some special capture templates for my work as a you
     "c" 'org-capture
     "rr" 'org-refile
     "e" 'org-export-dispatch
-    "oa" 'chris/org-agenda)
+    "oa" 'org-agenda-list)
   ('normal org-agenda-mode-map
            "q" 'org-agenda-quit
            "r" 'org-agenda-redo
@@ -1779,7 +1792,8 @@ I'd like to sync my org-files to caldav and hopefully use more native android ap
         org-caldav-files '("/home/chris/org/todo/todo.org"
                           "/home/chris/org/todo/notes.org"
                           "/home/chris/org/todo/prayer.org")
-        org-icalendar-alarm-time 15))
+        org-icalendar-alarm-time 15
+        org-icalendar-use-scheduled '(todo-start event-if-todo)))
 #+END_SRC
 
 ** Magit
diff --git a/init.el b/init.el
index 0d9c02e3..1d74f8e5 100644
--- a/init.el
+++ b/init.el
@@ -342,7 +342,8 @@ vertically."
     :keymaps 'override
     "si" 'consult-imenu
     "so" 'consult-org-heading
-    "sm" 'bookmark-jump))
+    "sm" 'bookmark-jump
+    "sy" 'consult-yank-from-kill-ring))
 
 (use-package marginalia
   :bind (:map minibuffer-local-map
@@ -395,6 +396,9 @@ vertically."
 
 (use-package projectile)
 
+(use-package simple-httpd
+  :ensure t)
+
 (use-package avy
   :after evil)
 
@@ -482,7 +486,7 @@ vertically."
 (use-package lsp-ui
   :hook (lsp-mode . lsp-ui-mode)
   :custom
-  (lsp-ui-doc-position 'top))
+  (lsp-ui-doc-position 'at-point))
 
 (use-package lsp-treemacs
   :after lsp)
@@ -717,7 +721,8 @@ vertically."
           ("oc" "Project changelog" entry #'+org-capture-central-project-changelog-file
            "* %U %?\n %i\n %a" :heading "Changelog" :prepend t))
         org-capture-use-agenda-date t
-        org-agenda-timegrid-use-ampm t)
+        org-agenda-timegrid-use-ampm t
+        org-agenda-tags-column -100)
 
   (setq org-imenu-depth 4
         org-odt-styles-file "/home/chris/org/style.odt"
@@ -793,7 +798,7 @@ vertically."
     "c" 'org-capture
     "rr" 'org-refile
     "e" 'org-export-dispatch
-    "oa" 'chris/org-agenda)
+    "oa" 'org-agenda-list)
   ('normal org-agenda-mode-map
            "q" 'org-agenda-quit
            "r" 'org-agenda-redo
@@ -1292,7 +1297,8 @@ If on a:
         org-caldav-files '("/home/chris/org/todo/todo.org"
                           "/home/chris/org/todo/notes.org"
                           "/home/chris/org/todo/prayer.org")
-        org-icalendar-alarm-time 15))
+        org-icalendar-alarm-time 15
+        org-icalendar-use-scheduled '(todo-start event-if-todo)))
 
 (use-package magit
   :commands (magit-status magit-get-current-branch)
diff --git a/yasnippets/org-mode/elispsrc b/yasnippets/org-mode/elispsrc
new file mode 100644
index 00000000..b8b1e9a7
--- /dev/null
+++ b/yasnippets/org-mode/elispsrc
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: Demo
+# key: <el
+# --
+
+#+BEGIN_SRC emacs-lisp
+$0
+#+END_SRC
\ No newline at end of file