         ("X" spacemacs/layouts-ms-kill-other :exit t))
       (spacemacs/set-leader-keys "l" 'spacemacs/layouts-transient-state/body)
 
-      ;; FIXME: This enables the dynamic behavior from micro-states using ? but
-      ;; does not yet do highlighting of the keys
+      ;; This enables the dynamic behavior from micro-states using ?
       (add-hook 'spacemacs-post-user-config-hook
                 (lambda ()
                   (setq spacemacs/layouts-transient-state/hint


      (spacemacs|define-transient-state layouts
        :title "Layouts Transient State"
        :bindings
        ;; need to exit in case number doesn't exist
        ("?" spacemacs//layouts-ms-toggle-doc)

              (concat (when current "[") caption (when current "]"))
            caption)))

      (defun spacemacs//layouts-ms-doc ()
        "Return the docstring for the layouts transient-state."
        (let* ((persp-list (or (persp-names-current-frame-fast-ordered)
