diff --git a/modules/app/calendar/autoload.el b/modules/app/calendar/autoload.el
index 0eca3dae3..fc99aea38 100644
--- a/modules/app/calendar/autoload.el
+++ b/modules/app/calendar/autoload.el
@@ -14,11 +14,13 @@
 
 ;;;###autoload
 (defun +calendar/quit ()
+  "TODO"
   (interactive)
   (+workspace/delete "Calendar"))
 
 ;;;###autoload
 (defun +calendar/open-calendar ()
+  "TODO"
   (interactive)
   (cfw:open-calendar-buffer
    ;; :custom-map cfw:my-cal-map
@@ -27,3 +29,17 @@
     (cfw:org-create-source (doom-color 'fg))  ; orgmode source
     )))
 
+;;;###autoload
+(defun +calendar*cfw:render-button (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))
+      (define-key keymap [mouse-1] command)
+      (cfw:tp text 'keymap keymap)
+      (cfw:tp text 'mouse-face 'highlight)
+      text))
diff --git a/modules/app/calendar/config.el b/modules/app/calendar/config.el
index db945988b..3870ca701 100644
--- a/modules/app/calendar/config.el
+++ b/modules/app/calendar/config.el
@@ -1,46 +1,40 @@
 ;;; app/calendar/config.el -*- lexical-binding: t; -*-
 
-(defvar +calendar-org-gcal-secret-file "~/.emacs.d/modules/private/org/secret.el")
-(defvar +calendar-open-calendar-function '+calendar/open-calendar)
+(defvar +calendar-org-gcal-secret-file
+  (expand-file-name "private/org/secret.el" doom-modules-dir)
+  "TODO")
+
+(defvar +calendar-open-calendar-function #'+calendar/open-calendar
+  "TODO")
+
+
+;;
+;; Plugins
+;;
+
 (def-package! calfw
   :commands (cfw: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 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 ?┓)
 
+  (map! :map cfw:calendar-mode-map "q" #'+calendar/quit)
 
-  (defun cfw:render-button (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))
-      (define-key keymap [mouse-1] command)
-      (cfw:tp text 'keymap keymap)
-      (cfw:tp text 'mouse-face 'highlight)
-      text))
+  (when (featurep 'solaire-mode)
+    (add-hook 'cfw:calendar-mode-hook #'solaire-mode))
+  (add-hook 'cfw:calendar-mode-hook 'doom-hide-modeline-mode)
+
+  (advice-add #'cfw:render-button :override #'+calendar*cfw:render-button))
 
-  (map! :map cfw:calendar-mode-map
-        "q" #'+calendar/quit)
-  (add-hook! 'cfw:calendar-mode-hook (solaire-mode +1)
-    (doom-hide-modeline-mode))
-  (map!
-   :map cfw:calendar-mode-map
-   "q" #'+calendar/quit))
 
 (def-package! calfw-org
   :commands (cfw:open-org-calendar
@@ -48,6 +42,7 @@
              cfw:open-org-calendar-withkevin
              my-open-calendar))
 
+
 (def-package! org-gcal
   :commands (org-gcal-sync
              org-gcal-fetch
@@ -59,4 +54,5 @@
   (defun org-gcal--notify (title mes)
     (message "org-gcal::%s - %s" title mes)))
 
+
 ;; (def-package! alert)