diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index d2ee8c6a..bb9c66db 100644
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -64,7 +64,7 @@
   </windowSwitcher>
 
   <!--
-    When using all workspaces optiion of window switcher, there is a replacement
+    When using all workspaces option of window switcher, there is a replacement
     for "type" above called "winfo" that will give more info about the window,
     workspace name, state of window (min, max, full) and output that it's on 
     if more than one monitor is being used. 
diff --git a/include/config/rcxml.h b/include/config/rcxml.h
index ff36e1c3..ac4d1795 100644
--- a/include/config/rcxml.h
+++ b/include/config/rcxml.h
@@ -21,7 +21,10 @@ enum window_switcher_field_content {
 	LAB_FIELD_IDENTIFIER,
 	LAB_FIELD_TRIMMED_IDENTIFIER,
 	LAB_FIELD_TITLE,
-	LAB_FIELD_WINFO,
+	LAB_FIELD_WORKSPACE,
+	LAB_FIELD_WIN_STATE,
+	LAB_FIELD_TYPE_SHORT,
+	LAB_FIELD_OUTPUT,
 };
 
 enum view_placement_policy {
@@ -142,7 +145,6 @@ struct rcxml {
 		bool show;
 		bool preview;
 		bool outlines;
-		bool all_workspaces;
 		uint32_t criteria;
 		struct wl_list fields;  /* struct window_switcher_field.link */
 	} window_switcher;
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index ea45d1ff..1959e9e1 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -206,8 +206,14 @@ fill_window_switcher_field(char *nodename, char *content)
 			current_field->content = LAB_FIELD_TRIMMED_IDENTIFIER;
 		} else if (!strcmp(content, "title")) {
 			current_field->content = LAB_FIELD_TITLE;
-		} else if (!strcmp(content, "winfo")) {
-			current_field->content = LAB_FIELD_WINFO;
+		} else if (!strcmp(content, "workspace")) {
+			current_field->content = LAB_FIELD_WORKSPACE;
+		} else if (!strcmp(content, "state")) {
+			current_field->content = LAB_FIELD_WIN_STATE;
+		} else if (!strcmp(content, "type_short")) {
+			current_field->content = LAB_FIELD_TYPE_SHORT;
+		} else if (!strcmp(content, "output")) {
+			current_field->content = LAB_FIELD_OUTPUT;
 		} else {
 			wlr_log(WLR_ERROR, "bad windowSwitcher field '%s'", content);
 		}
@@ -897,8 +903,7 @@ entry(xmlNode *node, char *nodename, char *content)
 	} else if (!strcasecmp(nodename, "outlines.windowSwitcher")) {
 		set_bool(content, &rc.window_switcher.outlines);
 	} else if (!strcasecmp(nodename, "allWorkspaces.windowSwitcher")) {
-		set_bool(content, &rc.window_switcher.all_workspaces);
-		if (rc.window_switcher.all_workspaces) {
+		if (parse_bool(content, -1) == true) {
 			rc.window_switcher.criteria &=
 				~LAB_VIEW_CRITERIA_CURRENT_WORKSPACE;
 		}
diff --git a/src/osd.c b/src/osd.c
index 2e61c192..0d2f0238 100644
--- a/src/osd.c
+++ b/src/osd.c
@@ -378,20 +378,24 @@ render_osd(struct server *server, cairo_t *cairo, int w, int h,
 			case LAB_FIELD_TYPE:
 				buf_add(&buf, get_type(*view));
 				break;
-			case LAB_FIELD_WINFO:
-				if (rc.window_switcher.all_workspaces) {
-					buf_add(&buf, (*view)->workspace->name);
-				}
-				if ((*view)->maximized) {
-					buf_add(&buf, " M ");
-				} else if ((*view)->minimized) {
-					buf_add(&buf, " m ");
-				} else if ((*view)->fullscreen) {
-					buf_add(&buf, " F ");
-				} else {
-					buf_add(&buf, "   ");
-				}
+			case LAB_FIELD_TYPE_SHORT:
 				buf_add(&buf, get_winfo(*view));
+				break;
+			case LAB_FIELD_WORKSPACE:
+				buf_add(&buf, (*view)->workspace->name);
+				break;
+			case LAB_FIELD_WIN_STATE:
+				if ((*view)->maximized) {
+					buf_add(&buf, "M");
+				} else if ((*view)->minimized) {
+					buf_add(&buf, "m");
+				} else if ((*view)->fullscreen) {
+					buf_add(&buf, "F");
+				} else {
+					buf_add(&buf, " ");
+				}
+				break;
+			case LAB_FIELD_OUTPUT:
 				if (wl_list_length(&server->outputs) > 1 &&
 						output_is_usable((*view)->output)) {
 					buf_add(&buf, (*view)->output->wlr_output->name);