-%token TOK_ATTACH "attach"
-%token TOK_EXEC "exec"
-%token TOK_EXIT "exit"
-%token TOK_RELOAD "reload"
-%token TOK_RESTART "restart"
-%token TOK_KILL "kill"
-%token TOK_FULLSCREEN "fullscreen"
-%token TOK_GLOBAL "global"
-%token TOK_LAYOUT "layout"
-%token TOK_DEFAULT "default"
-%token TOK_STACKED "stacked"
-%token TOK_TABBED "tabbed"
-%token TOK_BORDER "border"
-%token TOK_NORMAL "normal"
-%token TOK_NONE "none"
-%token TOK_1PIXEL "1pixel"
-%token TOK_MODE "mode"
-%token TOK_TILING "tiling"
-%token TOK_FLOATING "floating"
-%token TOK_WORKSPACE "workspace"
-%token TOK_TOGGLE "toggle"
-%token TOK_FOCUS "focus"
-%token TOK_MOVE "move"
-%token TOK_OPEN "open"
-%token TOK_NEXT "next"
-%token TOK_PREV "prev"
-%token TOK_SPLIT "split"
-%token TOK_HORIZONTAL "horizontal"
-%token TOK_VERTICAL "vertical"
-%token TOK_LEVEL "level"
-%token TOK_UP "up"
-%token TOK_DOWN "down"
-%token TOK_LEFT "left"
-%token TOK_RIGHT "right"
-%token TOK_RESTORE "restore"
-%token TOK_MARK "mark"
-%token TOK_RESIZE "resize"
-%token TOK_GROW "grow"
-%token TOK_SHRINK "shrink"
-%token TOK_PX "px"
-%token TOK_OR "or"
-%token TOK_PPT "ppt"
-%token TOK_NOP "nop"
-
-%token TOK_CLASS "class"
-%token TOK_ID "id"
-%token TOK_CON_ID "con_id"
-
-%token WHITESPACE "<whitespace>"
-%token STR "<string>"
-%token NUMBER "<number>"
+%token TOK_EXEC "exec"
+%token TOK_EXIT "exit"
+%token TOK_RELOAD "reload"
+%token TOK_RESTART "restart"
+%token TOK_KILL "kill"
+%token TOK_WINDOW "window"
+%token TOK_CLIENT "client"
+%token TOK_FULLSCREEN "fullscreen"
+%token TOK_GLOBAL "global"
+%token TOK_LAYOUT "layout"
+%token TOK_DEFAULT "default"
+%token TOK_STACKED "stacked"
+%token TOK_TABBED "tabbed"
+%token TOK_BORDER "border"
+%token TOK_NORMAL "normal"
+%token TOK_NONE "none"
+%token TOK_1PIXEL "1pixel"
+%token TOK_MODE "mode"
+%token TOK_TILING "tiling"
+%token TOK_FLOATING "floating"
+%token TOK_MODE_TOGGLE "mode_toggle"
+%token TOK_ENABLE "enable"
+%token TOK_DISABLE "disable"
+%token TOK_WORKSPACE "workspace"
+%token TOK_OUTPUT "output"
+%token TOK_TOGGLE "toggle"
+%token TOK_FOCUS "focus"
+%token TOK_MOVE "move"
+%token TOK_OPEN "open"
+%token TOK_NEXT "next"
+%token TOK_PREV "prev"
+%token TOK_SPLIT "split"
+%token TOK_HORIZONTAL "horizontal"
+%token TOK_VERTICAL "vertical"
+%token TOK_UP "up"
+%token TOK_DOWN "down"
+%token TOK_LEFT "left"
+%token TOK_RIGHT "right"
+%token TOK_PARENT "parent"
+%token TOK_CHILD "child"
+%token TOK_APPEND_LAYOUT "append_layout"
+%token TOK_MARK "mark"
+%token TOK_RESIZE "resize"
+%token TOK_GROW "grow"
+%token TOK_SHRINK "shrink"
+%token TOK_PX "px"
+%token TOK_OR "or"
+%token TOK_PPT "ppt"
+%token TOK_NOP "nop"
+
+%token TOK_CLASS "class"
+%token TOK_INSTANCE "instance"
+%token TOK_WINDOW_ROLE "window_role"
+%token TOK_ID "id"
+%token TOK_CON_ID "con_id"
+%token TOK_TITLE "title"
+
+%token <string> STR "<string>"
+%token <number> NUMBER "<number>"
+
+%type <number> direction
+%type <number> split_direction
+%type <number> fullscreen_mode
+%type <number> level
+%type <number> window_mode
+%type <number> boolean
+%type <number> border_style
+%type <number> layout_mode
+%type <number> resize_px
+%type <number> resize_way
+%type <number> resize_tiling
+%type <number> optional_kill_mode