-%token <number>NUMBER "<number>"
-%token <string>WORD "<word>"
-%token <string>STR "<string>"
-%token <string>STR_NG "<string (non-greedy)>"
-%token <string>HEX "<hex>"
-%token <string>OUTPUT "<RandR output>"
-%token TOKBIND
-%token TOKTERMINAL
-%token TOKCOMMENT "<comment>"
-%token TOKFONT "font"
-%token TOKBINDSYM "bindsym"
-%token MODIFIER "<modifier>"
-%token TOKCONTROL "control"
-%token TOKSHIFT "shift"
-%token WHITESPACE "<whitespace>"
-%token TOKFLOATING_MODIFIER "floating_modifier"
-%token QUOTEDSTRING "<quoted string>"
-%token TOKWORKSPACE "workspace"
-%token TOKOUTPUT "output"
-%token TOKASSIGN "assign"
-%token TOKSET
-%token TOKIPCSOCKET "ipc_socket"
-%token TOKEXEC "exec"
-%token TOKCOLOR
-%token TOKARROW "→"
-%token TOKMODE "mode"
-%token TOKNEWCONTAINER "new_container"
-%token TOKNEWWINDOW "new_window"
-%token TOKFOCUSFOLLOWSMOUSE "focus_follows_mouse"
-%token TOKCONTAINERMODE "default/stacking/tabbed"
-%token TOKSTACKLIMIT "stack-limit"
+%token <number> NUMBER "<number>"
+%token <string> WORD "<word>"
+%token <string> STR "<string>"
+%token <string> STR_NG "<string (non-greedy)>"
+%token <string> HEX "<hex>"
+%token <string> OUTPUT "<RandR output>"
+%token TOKBINDCODE
+%token TOKTERMINAL
+%token TOKCOMMENT "<comment>"
+%token TOKFONT "font"
+%token TOKBINDSYM "bindsym"
+%token <number> MODIFIER "<modifier>"
+%token TOKCONTROL "control"
+%token TOKSHIFT "shift"
+%token WHITESPACE "<whitespace>"
+%token TOKFLOATING_MODIFIER "floating_modifier"
+%token <string> QUOTEDSTRING "<quoted string>"
+%token TOKWORKSPACE "workspace"
+%token TOKOUTPUT "output"
+%token TOKASSIGN "assign"
+%token TOKSET
+%token TOKIPCSOCKET "ipc_socket"
+%token TOKRESTARTSTATE "restart_state"
+%token TOKEXEC "exec"
+%token <single_color> TOKSINGLECOLOR
+%token <color> TOKCOLOR
+%token TOKARROW "→"
+%token TOKMODE "mode"
+%token TOK_ORIENTATION "default_orientation"
+%token TOK_HORIZ "horizontal"
+%token TOK_VERT "vertical"
+%token TOK_AUTO "auto"
+%token TOK_WORKSPACE_LAYOUT "workspace_layout"
+%token TOKNEWWINDOW "new_window"
+%token TOK_NORMAL "normal"
+%token TOK_NONE "none"
+%token TOK_1PIXEL "1pixel"
+%token TOKFOCUSFOLLOWSMOUSE "focus_follows_mouse"
+%token TOKWORKSPACEBAR "workspace_bar"
+%token TOK_DEFAULT "default"
+%token TOK_STACKING "stacking"
+%token TOK_TABBED "tabbed"
+%token <number> TOKSTACKLIMIT "stack-limit"
+%token TOK_POPUP_DURING_FULLSCREEN "popup_during_fullscreen"
+%token TOK_IGNORE "ignore"
+%token TOK_LEAVE_FULLSCREEN "leave_fullscreen"
+
+%type <binding> binding
+%type <binding> bindcode
+%type <binding> bindsym
+%type <number> binding_modifiers
+%type <number> binding_modifier
+%type <number> direction
+%type <number> layout_mode
+%type <number> border_style
+%type <number> new_window
+%type <number> colorpixel
+%type <number> bool
+%type <number> popup_setting
+%type <string> command
+%type <string> word_or_number
+%type <string> optional_workspace_name
+%type <string> workspace_name
+%type <string> window_class
+%type <match> assign_target