diff --git a/settings/eaf-settings.el b/settings/eaf-settings.el
index c6bc9511..e6858aa1 100644
--- a/settings/eaf-settings.el
+++ b/settings/eaf-settings.el
@@ -9,101 +9,55 @@
   :load-path (lambda() (concat config-dir "lisp/emacs-application-framework"))
   ;;:after (org)  ;; eaf requires eaf-interleave requires org
   ;;:defer 2
-            ;;;eaf-open-demo
-  :commands (eaf-open)
+  :commands (eaf-create-minmap
+             eaf-file-browser-qrcode
+             eaf-file-sender-qrcode
+             eaf-file-sender-qrcode-in-dired
+             eaf-open
+             eaf-open-airshare
+             eaf-open-browser
+             eaf-open-browser-with-history
+             eaf-open-camera
+             eaf-open-demo
+             eaf-open-in-file-manager
+             eaf-open-jupyter
+             eaf-open-mail-as-html
+             eaf-open-mindmap
+             eaf-open-music-player
+             eaf-open-netease-cloud-music
+             eaf-open-office
+             eaf-open-rss-reader
+             eaf-open-system-monitor
+             eaf-open-terminal)
   ;;  :unless (string= (system-name) "hasp138dw")
   ;;:when (if (require 'dbus) (dbus-ping :session "org.freedesktop.Notifications"))
   :if my-dbusp  ;; EAF use DBus' session bus, it must run by a general user (DO NOT USE as root).
   :config
+  (require 'eaf-mail)                ;; core extensions
+  (require 'eaf-org)                 ;; core extensions
+  (require 'eaf-camera)
+  (require 'eaf-netease-cloud-music)
+  (require 'eaf-browser)
+  (require 'eaf-airshare)
+  (require 'eaf-vue-demo)
+  (require 'eaf-image-viewer)
+  (require 'eaf-pdf-viewer)
+  (require 'eaf-file-manager)
+  (require 'eaf-org-previewer)
+  (require 'eaf-file-sender)
+  (require 'eaf-music-player)
+  (require 'eaf-rss-reader)
+  (require 'eaf-video-player)
+  (require 'eaf-file-browser)
+  (require 'eaf-jupyter)
+  (require 'eaf-system-monitor)
+  (require 'eaf-terminal)
+  (require 'eaf-demo)
+  (require 'eaf-mindmap)
+  (require 'eaf-markdown-previewer)
   (eaf-setq eaf-browser-enable-adblocker "true")
   (setq eaf-find-alternate-file-in-dired t)
   (setq eaf-config-location (concat user-cache-directory "eaf/")))
 
-;; core extensions
-(use-package eaf-mail
-  :after (eaf)
-  :commands (eaf-open-mail-as-html))
-
-;; core extensions
-(use-package eaf-org
-  :after (eaf)
-  :commands (eaf-org-open))
-
-(use-package eaf-airshare
-  :after (eaf)
-  :commands (eaf-open-airshare))
-
-(use-package eaf-browser
-  :after (eaf)
-  :commands (eaf-open-browser
-             eaf-open-browser-with-history))
-
-(use-package eaf-camera
-  :after (eaf)
-  :commands (eaf-open-camera))
-
-(use-package eaf-file-browser
-  :after (eaf)
-  :commands (eaf-file-browser-qrcode))
-
-(use-package eaf-file-manager
-  :after (eaf)
-  :commands (eaf-open-in-file-manager))
-
-(use-package eaf-file-sender
-  :after (eaf)
-  :commands (eaf-file-sender-qrcode
-             eaf-file-sender-qrcode-in-dired))
-
-;; required for eaf-open with image files
-(use-package eaf-image-viewer
-  :after (eaf))
-
-(use-package eaf-jupyter
-  :after (eaf)
-  :commands (eaf-open-jupyter))
-
-;; required for eaf-open with markdown files
-(use-package eaf-markdown-previewer
-  :after (eaf))
-
-(use-package eaf-mindmap
-  :after (eaf)
-  :commands (eaf-open-mindmap
-             eaf-create-minmap))
-
-(use-package eaf-music-player
-  :after (eaf)
-  :commands (eaf-open-music-player))
-
-(use-package eaf-netease-cloud-music
-  :after (eaf)
-  :commands (eaf-open-netease-cloud-music))
-
-;; required for eaf-open with org files
-(use-package eaf-org-previewer
-  :after (eaf))
-
-;; required for eaf-open with pdf files
-(use-package eaf-pdf-viewer
-  :after (eaf)
-  :commands (eaf-open-office))
-
-(use-package eaf-rss-reader
-  :after (eaf)
-  :commands (eaf-open-rss-reader))
-
-(use-package eaf-system-monitor
-  :after (eaf)
-  :commands (eaf-open-system-monitor))
-
-(use-package eaf-terminal
-  :after (eaf)
-  :commands (eaf-open-terminal))
-
-;; required for eaf-open with video files
-(use-package eaf-video-player
-  :after (eaf))
-
 (provide 'eaf-settings)
 ;;; eaf-settings.el ends here