diff --git a/modules/app/calendar/README.org b/modules/app/calendar/README.org
index 9c5913a12..69951f55e 100644
--- a/modules/app/calendar/README.org
+++ b/modules/app/calendar/README.org
@@ -16,6 +16,8 @@ support.
 ** Packages
 - [[doom-package:calfw]]
 - [[doom-package:calfw-org]]
+- [[doom-package:calfw-cal]]
+- [[doom-package:calfw-ical]]
 - [[doom-package:org-gcal]]
   
 ** Hacks
@@ -48,15 +50,15 @@ calendar data from:
 #+begin_src emacs-lisp
 (defun my-open-calendar ()
   (interactive)
-  (cfw:open-calendar-buffer
+  (calfw-open-calendar-buffer
    :contents-sources
    (list
-    (cfw:org-create-source "Green")  ; org-agenda source
-    (cfw:org-create-file-source "cal" "/path/to/cal.org" "Cyan")  ; other org source
-    (cfw:howm-create-source "Blue")  ; howm source
-    (cfw:cal-create-source "Orange") ; diary source
-    (cfw:ical-create-source "Moon" "~/moon.ics" "Gray")  ; ICS source1
-    (cfw:ical-create-source "gcal" "https://..../basic.ics" "IndianRed") ; google calendar ICS
+    (calfw-org-create-source "Green")  ; org-agenda source
+    (calfw-org-create-file-source "cal" "/path/to/cal.org" "Cyan")  ; other org source
+    (calfw-howm-create-source "Blue")  ; howm source
+    (calfw-cal-create-source "Orange") ; diary source
+    (calfw-ical-create-source "Moon" "~/moon.ics" "Gray")  ; ICS source1
+    (calfw-ical-create-source "gcal" "https://..../basic.ics" "IndianRed") ; google calendar ICS
    )))
 #+end_src
 
diff --git a/modules/app/calendar/autoload.el b/modules/app/calendar/autoload.el
index 9d6f5a3ab..97ac1833d 100644
--- a/modules/app/calendar/autoload.el
+++ b/modules/app/calendar/autoload.el
@@ -5,9 +5,7 @@
   "Name of the workspace created by `=calendar', dedicated to calfw.")
 
 (defun +calendar--init ()
-  (if-let* ((win (cl-find-if (lambda (b) (string-match-p "^\\*cfw:" (buffer-name b)))
-                             (doom-visible-windows)
-                             :key #'window-buffer)))
+  (if-let* ((win (get-buffer-window calfw-calendar-buffer-name)))
       (select-window win)
     (call-interactively +calendar-open-function)))
 
@@ -20,8 +18,8 @@
         (+workspace-switch +calendar-workspace-name t)
         (unless (memq (buffer-local-value 'major-mode
                                           (window-buffer (selected-window)))
-                      '(cfw:details-mode
-                        cfw:calendar-mode))
+                      '(calfw-details-mode
+                        calfw-calendar-mode))
           (doom/switch-to-scratch-buffer)
           (+calendar--init))
         (+workspace/display))
@@ -46,24 +44,24 @@
 (defun +calendar/open-calendar ()
   "TODO"
   (interactive)
-  (cfw:open-calendar-buffer
-   ;; :custom-map cfw:my-cal-map
+  (calfw-open-calendar-buffer
+   ;; :custom-map calfw-my-cal-map
    :contents-sources
    (list
-    (cfw:org-create-source (face-foreground 'default))  ; orgmode source
+    (calfw-org-create-source (face-foreground 'default))  ; orgmode source
     )))
 
 ;;;###autoload
-(defun +calendar-cfw:render-button-a (title command &optional state)
+(defun +calendar-calfw-render-button-a (title command &optional state)
   "render-button
  TITLE
  COMMAND
  STATE"
   (let ((text (concat " " title " "))
         (keymap (make-sparse-keymap)))
-    (cfw:rt text (if state 'cfw:face-toolbar-button-on
-                   'cfw:face-toolbar-button-off))
+    (calfw-rt text (if state 'calfw-face-toolbar-button-on
+                   'calfw-face-toolbar-button-off))
     (define-key keymap [mouse-1] command)
-    (cfw:tp text 'keymap keymap)
-    (cfw:tp text 'mouse-face 'highlight)
+    (calfw-tp text 'keymap keymap)
+    (calfw-tp text 'mouse-face 'highlight)
     text))
diff --git a/modules/app/calendar/config.el b/modules/app/calendar/config.el
index 71e9e0232..cf65840ad 100644
--- a/modules/app/calendar/config.el
+++ b/modules/app/calendar/config.el
@@ -8,83 +8,83 @@
 ;; Packages
 
 (use-package! calfw
-  :commands cfw:open-calendar-buffer
+  :commands calfw-open-calendar-buffer
   :config
   ;; better frame for calendar
-  (setq cfw:face-item-separator-color nil
-        cfw:render-line-breaker 'cfw:render-line-breaker-none
-        cfw:fchar-junction ?╋
-        cfw:fchar-vertical-line ?┃
-        cfw:fchar-horizontal-line ?━
-        cfw:fchar-left-junction ?┣
-        cfw:fchar-right-junction ?┫
-        cfw:fchar-top-junction ?┯
-        cfw:fchar-top-left-corner ?┏
-        cfw:fchar-top-right-corner ?┓)
+  (setq calfw-face-item-separator-color nil
+        calfw-render-line-breaker 'calfw-render-line-breaker-none
+        calfw-fchar-junction ?╋
+        calfw-fchar-vertical-line ?┃
+        calfw-fchar-horizontal-line ?━
+        calfw-fchar-left-junction ?┣
+        calfw-fchar-right-junction ?┫
+        calfw-fchar-top-junction ?┯
+        calfw-fchar-top-left-corner ?┏
+        calfw-fchar-top-right-corner ?┓)
 
-  (set-popup-rule! "^\\*cfw:details" :quit t :ttl 0 :select t :size 0.4)
+  (set-popup-rule! "^\\*calfw-details" :quit t :ttl 0 :select t :size 0.4)
 
-  (define-key cfw:calendar-mode-map "q" #'+calendar/quit)
+  (define-key calfw-calendar-mode-map "q" #'+calendar/quit)
   (when (modulep! :editor evil +everywhere)
-    (set-evil-initial-state! '(cfw:calendar-mode cfw:details-mode) 'motion)
-    (add-hook! '(cfw:calendar-mode-hook cfw:details-mode-hook) #'evil-normalize-keymaps)
-    (map! (:map cfw:calendar-mode-map
+    (set-evil-initial-state! '(calfw-calendar-mode calfw-details-mode) 'motion)
+    (add-hook! '(calfw-calendar-mode-hook calfw-details-mode-hook) #'evil-normalize-keymaps)
+    (map! (:map calfw-calendar-mode-map
            :m "q"   #'+calendar/quit
-           :m "SPC" #'cfw:show-details-command
-           :m "RET" #'cfw:show-details-command
-           :m "TAB"     #'cfw:navi-prev-item-command
-           :m [tab]     #'cfw:navi-prev-item-command
-           :m [backtab] #'cfw:navi-next-item-command
-           :m "$"   #'cfw:navi-goto-week-end-command
-           :m "."   #'cfw:navi-goto-today-command
-           :m "<"   #'cfw:navi-previous-month-command
-           :m ">"   #'cfw:navi-next-month-command
-           :m "C-h" #'cfw:navi-previous-month-command
-           :m "C-l" #'cfw:navi-next-month-command
-           :m "D"   #'cfw:change-view-day
-           :m "M"   #'cfw:change-view-month
-           :m "T"   #'cfw:change-view-two-weeks
-           :m "W"   #'cfw:change-view-week
-           :m "^"   #'cfw:navi-goto-week-begin-command
-           :m "gr"  #'cfw:refresh-calendar-buffer
-           :m "h"   #'cfw:navi-previous-day-command
-           :m "H"   #'cfw:navi-goto-first-date-command
-           :m "j"   #'cfw:navi-next-week-command
-           :m "k"   #'cfw:navi-previous-week-command
-           :m "l"   #'cfw:navi-next-day-command
-           :m "L"   #'cfw:navi-goto-last-date-command
-           :m "t"   #'cfw:navi-goto-today-command)
-          (:map cfw:details-mode-map
-           :m "SPC" #'cfw:details-kill-buffer-command
-           :m "RET" #'cfw:details-kill-buffer-command
-           :m "TAB"     #'cfw:details-navi-prev-item-command
-           :m [tab]     #'cfw:details-navi-prev-item-command
-           :m [backtab] #'cfw:details-navi-next-item-command
-           :m "q"   #'cfw:details-kill-buffer-command
-           :m "C-h" #'cfw:details-navi-prev-command
-           :m "C-l" #'cfw:details-navi-next-command
-           :m "C-k" #'cfw:details-navi-prev-item-command
-           :m "C-j" #'cfw:details-navi-next-item-command)))
+           :m "SPC" #'calfw-show-details-command
+           :m "RET" #'calfw-show-details-command
+           :m "TAB"     #'calfw-navi-prev-item-command
+           :m [tab]     #'calfw-navi-prev-item-command
+           :m [backtab] #'calfw-navi-next-item-command
+           :m "$"   #'calfw-navi-goto-week-end-command
+           :m "."   #'calfw-navi-goto-today-command
+           :m "<"   #'calfw-navi-previous-month-command
+           :m ">"   #'calfw-navi-next-month-command
+           :m "C-h" #'calfw-navi-previous-month-command
+           :m "C-l" #'calfw-navi-next-month-command
+           :m "D"   #'calfw-change-view-day
+           :m "M"   #'calfw-change-view-month
+           :m "T"   #'calfw-change-view-two-weeks
+           :m "W"   #'calfw-change-view-week
+           :m "^"   #'calfw-navi-goto-week-begin-command
+           :m "gr"  #'calfw-refresh-calendar-buffer
+           :m "h"   #'calfw-navi-previous-day-command
+           :m "H"   #'calfw-navi-goto-first-date-command
+           :m "j"   #'calfw-navi-next-week-command
+           :m "k"   #'calfw-navi-previous-week-command
+           :m "l"   #'calfw-navi-next-day-command
+           :m "L"   #'calfw-navi-goto-last-date-command
+           :m "t"   #'calfw-navi-goto-today-command)
+          (:map calfw-details-mode-map
+           :m "SPC" #'calfw-details-kill-buffer-command
+           :m "RET" #'calfw-details-kill-buffer-command
+           :m "TAB"     #'calfw-details-navi-prev-item-command
+           :m [tab]     #'calfw-details-navi-prev-item-command
+           :m [backtab] #'calfw-details-navi-next-item-command
+           :m "q"   #'calfw-details-kill-buffer-command
+           :m "C-h" #'calfw-details-navi-prev-command
+           :m "C-l" #'calfw-details-navi-next-command
+           :m "C-k" #'calfw-details-navi-prev-item-command
+           :m "C-j" #'calfw-details-navi-next-item-command)))
 
-  (add-hook 'cfw:calendar-mode-hook #'doom-mark-buffer-as-real-h)
-  (add-hook 'cfw:calendar-mode-hook #'hide-mode-line-mode)
+  (add-hook 'calfw-calendar-mode-hook #'doom-mark-buffer-as-real-h)
+  (add-hook 'calfw-calendar-mode-hook #'hide-mode-line-mode)
 
-  (advice-add #'cfw:render-button :override #'+calendar-cfw:render-button-a))
+  (advice-add #'calfw-render-button :override #'+calendar-calfw-render-button-a))
 
 
 (use-package! calfw-org
-  :commands (cfw:open-org-calendar
-             cfw:org-create-source
-             cfw:org-create-file-source
-             cfw:open-org-calendar-withkevin))
+  :commands (calfw-open-org-calendar
+             calfw-org-create-source
+             calfw-org-create-file-source
+             calfw-open-org-calendar-withkevin))
 
 
 (use-package! calfw-cal
-  :commands (cfw:cal-create-source))
+  :commands (calfw-cal-create-source))
 
 
 (use-package! calfw-ical
-  :commands (cfw:ical-create-source))
+  :commands (calfw-ical-create-source))
 
 
 (use-package! org-gcal
diff --git a/modules/lang/clojure/packages.el b/modules/lang/clojure/packages.el
index 7887ecde6..70f99f826 100644
--- a/modules/lang/clojure/packages.el
+++ b/modules/lang/clojure/packages.el
@@ -16,9 +16,9 @@
 ;;; Core packages
 (package! clojure-mode :pin "28dc02114ae70db6bb68d537ea77985f272120bc")
 (when (and (modulep! +tree-sitter) (treesit-available-p))
-  (package! clojure-ts-mode :pin "32490c80fad7d27367b08d967e8184f75b4ca19e"))
+  (package! clojure-ts-mode :pin "96fdffcbe9e1b8ebf9ad14e23b06f62cc3422e22"))
 (package! clj-refactor :pin "362cb46bf808dc42d2aaf022afe93048439680c4")
-(package! cider :pin "389833f85a8f7e648de73fd9a625674c8ecf85e9")
+(package! cider :pin "fb7aa888125dfd5f174b6c208deca66d3fc129ab")
 (when (modulep! :checkers syntax -flymake)
   (package! flycheck-clj-kondo :pin "e38c67ba9db1ea1cbe1b61ab39b506c05efdcdbf"))
 (package! jet :pin "c9a92675efd802f37df5e3eab7858dbbeced6ea4")