diff --git a/README.md b/README.md
index 404f322..8ab9356 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,12 @@ It features:
 + Hybrid layout modes (tiling & stacking)
 + Dynamic workspace support
 + ICCCM/EWMH compliance
-+ (Optional) RandR (multi-monitor) support
-+ (Optional) Builtin system tray
-+ (Optional) Builtin input method
-+ (Optional) Background setting support
+Optional features:
++ RandR (multi-monitor) support
++ System tray
++ Input method
++ Background setting support
++ XSETTINGS server
 
 Please check out the
 [screenshots](https://github.com/emacs-exwm/exwm/wiki/Screenshots)
diff --git a/exwm.el b/exwm.el
index a80232d..bf074b6 100644
--- a/exwm.el
+++ b/exwm.el
@@ -35,10 +35,12 @@
 ;; + Hybrid layout modes (tiling & stacking)
 ;; + Dynamic workspace support
 ;; + ICCCM/EWMH compliance
-;; + (Optional) RandR (multi-monitor) support
-;; + (Optional) Built-in system tray
-;; + (Optional) Builtin input method
-;; + (Optional) Background setting support
+;; Optional features:
+;; + RandR (multi-monitor) support
+;; + System tray
+;; + Input method
+;; + Background setting support
+;; + XSETTINGS server
 
 ;; Installation & configuration
 ;; ----------------------------