diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 3a4280c3..5532a041 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -77,17 +77,15 @@ The rest of this man page describes configuration options.
 	be used with labwc the preferred mode of the monitor is used instead.
 	Default is no.
 
-*<core><cycleViewOSD>* [yes|no]
-	Draw the OSD when cycling between windows.
-	Default is yes.
+*<core><windowSwitcher show="" preview="" outlines="" />*
+	*show* [yes|no] Draw the OnScreenDisplay when switching between
+	windows. Default is yes.
 
-*<core><cycleViewPreview>* [yes|no]
-	Preview the contents of the selected window when cycling between windows.
-	Default is no.
+	*preview* [yes|no] Preview the contents of the selected window when
+	switching between windows. Default is no.
 
-*<core><cycleViewOutlines>* [yes|no]
-	Draw an outline around the selected window when cycling between windows.
-	Default is yes.
+	*outlines* [yes|no] Draw an outline around the selected window when
+	switching between windows. Default is yes.
 
 ## RESISTANCE
 
diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index a92bc730..716ac795 100644
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -12,9 +12,7 @@
     <gap>0</gap>
     <adaptiveSync>no</adaptiveSync>
     <reuseOutputMode>no</reuseOutputMode>
-    <cycleViewOSD>yes</cycleViewOSD>
-    <cycleViewPreview>no</cycleViewPreview>
-    <cycleViewOutlines>yes</cycleViewOutlines>
+    <windowSwitcher show="yes" preview="no" outlines="yes" />
   </core>
 
   <!-- <font><theme> can be defined without an attribute to set all places -->
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 8b968a2e..d2052b6f 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -442,12 +442,29 @@ entry(xmlNode *node, char *nodename, char *content)
 		rc.snap_edge_range = atoi(content);
 	} else if (!strcasecmp(nodename, "topMaximize.snapping")) {
 		rc.snap_top_maximize = get_bool(content);
+
+	/* <windowSwitcher show="" preview="" outlines="" /> */
+	} else if (!strcasecmp(nodename, "show.windowSwitcher.core")) {
+		rc.cycle_view_osd = get_bool(content);
+	} else if (!strcasecmp(nodename, "preview.windowSwitcher.core")) {
+		rc.cycle_preview_contents = get_bool(content);
+	} else if (!strcasecmp(nodename, "outlines.windowSwitcher.core")) {
+		rc.cycle_preview_outlines = get_bool(content);
+
+	/* The following three are for backward compatibility only */
 	} else if (!strcasecmp(nodename, "cycleViewOSD.core")) {
 		rc.cycle_view_osd = get_bool(content);
+		wlr_log(WLR_ERROR, "<cycleViewOSD> is deprecated."
+			" Use <windowSwitcher show=\"\" />");
 	} else if (!strcasecmp(nodename, "cycleViewPreview.core")) {
 		rc.cycle_preview_contents = get_bool(content);
+		wlr_log(WLR_ERROR, "<cycleViewPreview> is deprecated."
+			" Use <windowSwitcher preview=\"\" />");
 	} else if (!strcasecmp(nodename, "cycleViewOutlines.core")) {
 		rc.cycle_preview_outlines = get_bool(content);
+		wlr_log(WLR_ERROR, "<cycleViewOutlines> is deprecated."
+			" Use <windowSwitcher outlines=\"\" />");
+
 	} else if (!strcasecmp(nodename, "name.names.desktops")) {
 		struct workspace *workspace = znew(*workspace);
 		workspace->name = xstrdup(content);