diff --git a/README.md b/README.md
index 7f918bd29..103948c63 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,20 @@
 # Emacs X Window Manager
 
-EXWM (Emacs X Window Manager) is a full-featured tiling X window manager for
-Emacs built on top of [XELB](https://github.com/ch11ng/xelb).
+EXWM (Emacs X Window Manager) is a full-featured tiling X window manager
+for Emacs built on top of [XELB](https://github.com/ch11ng/xelb).
 It features:
 + Fully keyboard-driven operations
 + Hybrid layout modes (tiling & stacking)
-+ Workspace support
++ Dynamic workspace support
 + ICCCM/EWMH compliance
 + (Optional) RandR (multi-monitor) support
-+ (Optional) system tray
++ (Optional) Built-in system tray
 
-Please check the [User Guide](https://github.com/ch11ng/exwm/wiki)
-for more details.
+Please check out the
+[screenshots](https://github.com/ch11ng/exwm/wiki/Screenshots)
+to get an overview of what EXWM is capable of,
+and the [user guide](https://github.com/ch11ng/exwm/wiki)
+for a detailed explanation of its usage.
 
-**Note**: If you install EXWM from source, you need to manually install XELB
-(either from source or GNU ELPA).
+**Note**: If you install EXWM from source, it's recommended to install
+XELB also from source (otherwise install both from GNU ELPA).
diff --git a/exwm-core.el b/exwm-core.el
index fd26d2cdd..fe46c8bcb 100644
--- a/exwm-core.el
+++ b/exwm-core.el
@@ -193,8 +193,12 @@
     "---"
     "*Workspace*"
     "---"
-    ["Move window to" exwm-workspace-move-window :keys "C-c C-m"]
-    ["Switch to buffer" exwm-workspace-switch-to-buffer]
+    ["Add workspace" exwm-workspace-add]
+    ["Delete current workspace" exwm-workspace-delete]
+    ["Move workspace to" exwm-workspace-move]
+    ["Swap workspaces" exwm-workspace-swap]
+    ["Move X window to" exwm-workspace-move-window :keys "C-c C-m"]
+    ["Move X window from" exwm-workspace-switch-to-buffer]
     ["Switch workspace" exwm-workspace-switch]
     ;; Place this entry at bottom to avoid selecting others by accident.
     ("Switch to" :filter
diff --git a/exwm.el b/exwm.el
index f7d027ebc..b6bc164e5 100644
--- a/exwm.el
+++ b/exwm.el
@@ -28,14 +28,15 @@
 
 ;; Overview
 ;; --------
-;; EXWM (Emacs X Window Manager) is a full-featured tiling X window manager for
-;; Emacs built on top of XELB.  It features:
+;; EXWM (Emacs X Window Manager) is a full-featured tiling X window manager
+;; for Emacs built on top of [XELB](https://github.com/ch11ng/xelb).
+;; It features:
 ;; + Fully keyboard-driven operations
 ;; + Hybrid layout modes (tiling & stacking)
-;; + Workspace support
+;; + Dynamic workspace support
 ;; + ICCCM/EWMH compliance
-;; ++ (Optional) RandR (multi-monitor) support
-;; ++ (Optional) system tray
+;; + (Optional) RandR (multi-monitor) support
+;; + (Optional) Builtin system tray
 
 ;; Installation & configuration
 ;; ----------------------------