diff --git a/README.org b/README.org
index ba0a2adf..8f54d9fe 100644
--- a/README.org
+++ b/README.org
@@ -689,9 +689,7 @@ Part of this config includes some special capture templates for my work as a you
     "Remove the org-columns overlay and turn on olivetti-mode"
     (interactive)
     (org-columns-quit)
-    (chris/org-mode-setup)
-    (setq visual-fill-column-width 100)
-    (setq visual-fill-column-width 100))
+    (chris/org-mode-setup))
 
   ;; (add-hook 'org-agenda-finalize-hook 'evil-normal-state)
   (add-hook 'org-agenda-finalize-hook 'chris/org-agenda-setup)
@@ -745,6 +743,7 @@ Part of this config includes some special capture templates for my work as a you
            "ze" 'org-emphasize
            "zn" 'org-narrow-to-subtree
            "zw" 'widen
+           "zp" 'org-set-property
            "S" 'org-schedule
            "t" 'org-todo
            "gf" 'org-footnote-action
@@ -2482,7 +2481,7 @@ Let's add org-msg to write emails in org-mode
       (cfw:org-create-source
        "Cyan")  ; org-agenda source
       (cfw:ical-create-source
-       "NV" "https://www.nvhuskies.org/vnews/display.v?ical" "Green")  ; School Calendar
+       "NV" "https://thrillshare-cmsv2.services.thrillshare.com/api/v4/o/6958/cms/events/generate_ical?filter_ids&section_ids" "Green")  ; School Calendar
       (cfw:ical-create-source
        "Outlook" "https://outlook.office365.com/owa/calendar/62a0d491bec4430e825822afd2fd1c01@tfcconnection.org/9acc5bc27ca24ce7a900c57284959f9d8242340735661296952/S-1-8-2197686000-2519837503-3687200543-3873966527/reachcalendar.ics" "Yellow")  ; Outlook Calendar
       )))
diff --git a/init.el b/init.el
index ec6f0a92..11bf11cf 100644
--- a/init.el
+++ b/init.el
@@ -482,9 +482,7 @@
     "Remove the org-columns overlay and turn on olivetti-mode"
     (interactive)
     (org-columns-quit)
-    (chris/org-mode-setup)
-    (setq visual-fill-column-width 100)
-    (setq visual-fill-column-width 100))
+    (chris/org-mode-setup))
 
   ;; (add-hook 'org-agenda-finalize-hook 'evil-normal-state)
   (add-hook 'org-agenda-finalize-hook 'chris/org-agenda-setup)
@@ -538,6 +536,7 @@
            "ze" 'org-emphasize
            "zn" 'org-narrow-to-subtree
            "zw" 'widen
+           "zp" 'org-set-property
            "S" 'org-schedule
            "t" 'org-todo
            "gf" 'org-footnote-action
@@ -1715,7 +1714,7 @@ targets."
       (cfw:org-create-source
        "Cyan")  ; org-agenda source
       (cfw:ical-create-source
-       "NV" "https://www.nvhuskies.org/vnews/display.v?ical" "Green")  ; School Calendar
+       "NV" "https://thrillshare-cmsv2.services.thrillshare.com/api/v4/o/6958/cms/events/generate_ical?filter_ids&section_ids" "Green")  ; School Calendar
       (cfw:ical-create-source
        "Outlook" "https://outlook.office365.com/owa/calendar/62a0d491bec4430e825822afd2fd1c01@tfcconnection.org/9acc5bc27ca24ce7a900c57284959f9d8242340735661296952/S-1-8-2197686000-2519837503-3687200543-3873966527/reachcalendar.ics" "Yellow")  ; Outlook Calendar
       )))