From 364b72a480dd094cb38876c1f44a34f303a83500 Mon Sep 17 00:00:00 2001
From: Steven Knight <steven@knight.cx>
Date: Thu, 28 Nov 2013 14:35:55 -0500
Subject: [PATCH] Changed keyword.other to keyword.control as most color
 schemes don't implement the scope keyword.other

---
 Syntax/i3wm_config.YAML-tmLanguage | 172 ++++++++++++++---------------
 Syntax/i3wm_config.tmLanguage      | 172 ++++++++++++++---------------
 2 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/Syntax/i3wm_config.YAML-tmLanguage b/Syntax/i3wm_config.YAML-tmLanguage
index eb9ef25..ec89e15 100644
--- a/Syntax/i3wm_config.YAML-tmLanguage
+++ b/Syntax/i3wm_config.YAML-tmLanguage
@@ -22,80 +22,80 @@ patterns:
 - name: font_pango
   match: (font\ pango\:)\s*([- ,\w]*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 - name: font
   match: (font)\s*([-\w]*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # fullscreen
 - name: fullscreen
   match: (fullscreen)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.string.i3wm_config}
 
 # floating_modifier <Modifiers>
 - name: floating_modifier
   match: (floating_modifier)\s*(\$?\w*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: meta.scope.variable.other.i3wm_config}
 
 # floating_minimum_size <Modifiers>
 - name: floating_minimum_size
   match: (floating_minimum_size)\s*(-?\d*)\s*(x)\s*(-?\d*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.numeric.i3wm_config}
-    '3': {name: keyword.other.i3wm_config}
+    '3': {name: keyword.control.i3wm_config}
     '4': {name: constant.numeric.i3wm_config}
 
 # floating_maximum_size <Modifiers>
 - name: floating_maximum_size
   match: (floating_maximum_size)\s*(-?\d*)\s*(x)\s*(-?\d*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.numeric.i3wm_config}
-    '3': {name: keyword.other.i3wm_config}
+    '3': {name: keyword.control.i3wm_config}
     '4': {name: constant.numeric.i3wm_config}
 
 # default_orientation <Modifiers>
 - name: default_orientation
   match: (default_orientation)\s*(vertical|horizontal|v|h|auto|a)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # workspace_layout <Modifiers>
 - name: workspace_layout
   match: (workspace_layout)\s*(default|stacking|tabbed|d|s|t)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # new_(window|float) <Modifiers>
 - name: new_window_or_float
   match: (new_(?:window|float))\s*(normal|none|(?:\d*pixel\s\d*))
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 #hide_edge_borders <vertical|horizontal|v|h>
 - name: hide_edge_borders
   match: (hide_edge_borders)\s*(vertical|horizontal|none|both|v|h|n|b)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 #for_window <criteria> command
 - name: for_window
   match: (for_window)\s*\[(\w*)=([\"\w\s\:\~\/\$]*\])\s*
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.string.i3wm_config}
 
@@ -103,7 +103,7 @@ patterns:
 - name: set
   match: (set)\s*(\$\w*)\s*(\w*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: meta.scope.variable.other.i3wm_config}
     '3': {name: constant.language.i3wm_config}
 
@@ -111,7 +111,7 @@ patterns:
 - name: assign
   match: (assign)\s*\[(.*)]\s*(→)?\s*([\w\d]*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.string.i3wm_config}
     '3': {name: keyword.operator.i3wm_config}
     '4': {name: constant.language.i3wm_config}
@@ -120,7 +120,7 @@ patterns:
 - name: exec_always
   match: (exec_always)\s*(\-\-no-startup-id)?\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.string.i3wm_config}
 
@@ -128,7 +128,7 @@ patterns:
 - name: exec
   match: (exec)\s*(\-\-no-startup-id)?\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.string.i3wm_config}
 
@@ -136,7 +136,7 @@ patterns:
 - name: client_focused
   match: (client.focused)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.string.i3wm_config}
     '3': {name: constant.string.i3wm_config}
     '4': {name: constant.string.i3wm_config}
@@ -146,7 +146,7 @@ patterns:
 - name: client_focused_inactive
   match: (client\.focused\_inactive)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.string.i3wm_config}
     '3': {name: constant.string.i3wm_config}
     '4': {name: constant.string.i3wm_config}
@@ -156,7 +156,7 @@ patterns:
 - name: client_unfocused
   match: (client\.unfocused)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.string.i3wm_config}
     '3': {name: constant.string.i3wm_config}
     '4': {name: constant.string.i3wm_config}
@@ -166,7 +166,7 @@ patterns:
 - name: client_urgent
   match: (client\.urgent)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.string.i3wm_config}
     '3': {name: constant.string.i3wm_config}
     '4': {name: constant.string.i3wm_config}
@@ -176,56 +176,56 @@ patterns:
 - name: ipc_socket
   match: (ipc-socket)\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.string.i3wm_config}
 
 # focus_follows_mouse yes|no
 - name: focus_follows_mouse
   match: (focus_follows_mouse)\s*(yes|no|y|n)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # popup_during_fullscreen
 - name: popup_during_fullscreen
   match: (popup_during_fullscreen)\s*(smart|ignore|leave_fullscreen)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # force_focus_wrapping yes|no
 - name: force_focus_wrapping
   match: (force_focus_wrapping)\s*(yes|no|y|n)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # force_xinerama <yes|no>
 - name: force_xinerama
   match: (force_xinerama)\s*(no|yes)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # force_xinerama <yes|no>
 - name: force_xinerama
   match: (force_xinerama)\s*(yes|no|y|n)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # workspace_auto_back_and_forth <yes|no>
 - name: workspace_auto_back_and_forth
   match: (workspace_auto_back_and_forth)\s*(yes|no|y|n)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # force_display_urgency_hint <timeout> ms
 - name: force_display_urgency_hint
   match: (force_display_urgency_hint)\s*(\d*)\s*ms
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.numeric.i3wm_config}
 
 
@@ -237,27 +237,27 @@ patterns:
 - name: bar
   match: (?:^ *|\G *)(bar)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
 
 # i3bar_command i3status --config ~/.i3/i3status.conf
 - name: i3bar_command
   match: (i3bar_command)\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # status_command i3status --config ~/.i3/i3status.conf
 - name: status_command
   match: (status_command)\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # modifier <Modifier>
 - name: modifier
   match: (modifier)\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # hidden_state <show|hide>
@@ -271,42 +271,42 @@ patterns:
 - name: mode
   match: (mode)\s*(dock|hide|invisible)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # bar_id <bar_id>
 - name: id
   match: (id)\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # position <bottom|top>
 - name: position
   match: (position)\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # output <output>
 - name: output
   match: (output)\s*(\w*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # tray_output primary
 - name: tray_output
   match: (tray_output)\s*(\w*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # workspace_buttons <yes|no>
 - name: workspace_buttons
   match: (workspace_buttons)\s*(yes|no|y|n)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # colors {
@@ -315,35 +315,35 @@ patterns:
 - name: colors
   match: (colors)\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: meta.scope.block.i3wm_config}
 
 # background <color>
 - name: background
   match: (background)\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # statusline <color>
 - name: statusline
   match: (statusline)\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # separator <color>
 - name: separator
   match: (separator)\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # focused_workspace <color> <color> <color>
 - name: focused_workspace
   match: (focused_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.language.i3wm_config}
     '4': {name: constant.language.i3wm_config}
@@ -353,7 +353,7 @@ patterns:
 - name: active_workspace
   match: (active_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.language.i3wm_config}
     '4': {name: constant.language.i3wm_config}
@@ -363,7 +363,7 @@ patterns:
 - name: inactive_workspace
   match: (inactive_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.language.i3wm_config}
     '4': {name: constant.language.i3wm_config}
@@ -373,7 +373,7 @@ patterns:
 - name: urgent_workspace
   match: (urgent_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.language.i3wm_config}
     '4': {name: constant.language.i3wm_config}
@@ -384,14 +384,14 @@ patterns:
 - name: bindcode
   match: (bindcode)\s*(--release)?\s*(\d*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.numeric.i3wm_config}
 
 - name: bindsym
   match: (bindsym)\s*(--release)?\s*([$\w\+]*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: meta.scope.variable.other.i3wm_config}
 
@@ -399,28 +399,28 @@ patterns:
 - name: split
   match: (split)\s*(vertical|horizontal|v|h)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # layout <default|tabbed|stacking|splitv|splith>
 - name: layout
   match: (layout)\s*(default|tabbed|stacking|split v|split h)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # layout toggle [split|all]
 - name: layout_toggle
   match: (layout toggle)\s*(split|all)?
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # floating toggle
 - name: floating_toggle
   match: (floating toggle)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # focus <left|right|down|up>
@@ -428,21 +428,21 @@ patterns:
 - name: focus
   match: (focus)\s*(left|right|down|up|l|r|d|u|parent|child|floating|tiling|mode_toggle)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # focus output <<left|right|down|up>|output>
 - name: focus_output
   match: (focus output)\s*(left|right|down|up|l|r|d|u|(?:[-\w]*))
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # move <left|right|down|up> [<px> px]
 - name: move
   match: (move)\s*(left|right|down|up|l|r|d|u)(?:\s*(-?\d*)\s*(px)\s*(?:(-?\d*)\s*(px))?)?
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.numeric.i3wm_config}
     '4': {name: constant.language.i3wm_config}
@@ -453,7 +453,7 @@ patterns:
 - name: move_abs
   match: (move)\s*(absolute)\s*(position)\s*(?:(\d*)\s*(px))?(?:\s*(\d*)\s*(px))?(?:\s*(center)|\s*(?:(\d*) (px))\s*(?:(\d*)\s*(px)))?
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.language.i3wm_config}
     '4': {name: constant.numeric.i3wm_config}
@@ -473,7 +473,7 @@ patterns:
 - name: workspace
   match: (workspace)\s*(next|prev|next_on_output|prev_on_output|back_and_forth|(?:\w)*|(?:\d*\s*\w*))
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # rename workspace <old_name> to <new_name>
@@ -481,9 +481,9 @@ patterns:
 - name: rename_workspace
   match: (rename workspace)\s*([:\s\w]*)\s*(to)\s*([:\s\w]*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
-    '3': {name: keyword.other.i3wm_config}
+    '3': {name: keyword.control.i3wm_config}
     '4': {name: constant.language.i3wm_config}
     '5': {name: constant.language.i3wm_config}
 
@@ -495,10 +495,10 @@ patterns:
 - name: move__container_or_workspace
   match: (move)\s*(workspace|container)\s*(to)\s*(output)\s*(left|right|down|up|[\w]*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
-    '2': {name: keyword.other.i3wm_config}
-    '3': {name: keyword.other.i3wm_config}
-    '4': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: keyword.control.i3wm_config}
+    '3': {name: keyword.control.i3wm_config}
+    '4': {name: keyword.control.i3wm_config}
     '5': {name: constant.language.i3wm_config}
 
 # move workspace <next|prev|next_on_output|prev_on_output>
@@ -508,8 +508,8 @@ patterns:
 - name: move_workspace
   match: (move)\s*(workspace)\s*(next|prev|next_on_output|prev_on_output|back_and_forth|(?:\w)*|(?:\d*\s*\w*))
   captures:
-    '1': {name: keyword.other.i3wm_config}
-    '2': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: keyword.control.i3wm_config}
     '3': {name: constant.language.i3wm_config}
 
 # move [window|container] [to] workspace <name>
@@ -518,22 +518,22 @@ patterns:
 - name: move__window_or_container
   match: (move)\s*(window|container)\s*(to)?
   captures:
-    '1': {name: keyword.other.i3wm_config}
-    '2': {name: keyword.other.i3wm_config}
-    '3': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: keyword.control.i3wm_config}
+    '3': {name: keyword.control.i3wm_config}
 
 # resize_mode
 - name: resize_mode
   match: (mode)\s*\"(resize)\"\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.stirng.i3wm_config}
 
 # resize <grow|shrink> <direction> [<px> px [or <ppt> ppt]]
 - name: resize
   match: (resize)\s*(grow|shrink)\s*(width|height)\s*(\d*)\s*(px)\s*(or)\s*(\d*)\s*(ppt)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.language.i3wm_config}
     '4': {name: constant.numeric.i3wm_config}
@@ -546,25 +546,25 @@ patterns:
 - name: resize_mode_default
   match: (mode)\s*\"(default)\"
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.stirng.i3wm_config}
 
 - name: focus
   match: (focus)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
 
 - name: mark_identifier
   match: (unmark|mark)\s*(.*)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # border
 - name: border
   match: (border)\s*(normal|none|(?:(\d*)\s*pixel))
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # shmlog <size in bytes>
@@ -572,7 +572,7 @@ patterns:
 - name: shmlog
   match: (shmlog)\s*(?:(on|off|toggle)|(\d*))
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.numeric.i3wm_config}
 
@@ -580,7 +580,7 @@ patterns:
 - name: shmlog
   match: (debuglog)\s*(on|off|toggle)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.numeric.i3wm_config}
 
@@ -588,39 +588,39 @@ patterns:
 - name: reload
   match: (reload)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
 
 # restart
 - name: restart
   match: (restart)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
 
 # exit
 - name: exit
   match: (exit)
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
 
 # move scratchpad
 - name: move_scratchpad
   match: (move)\s*(scratchpad)
   captures:
-    '1': {name: keyword.other.i3wm_config}
-    '2': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: keyword.control.i3wm_config}
 
 # scratchpad show
 - name: scratchpad_show
   match: (scratchpad)\s*(show)
   captures:
-    '1': {name: keyword.other.i3wm_config}
-    '2': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: keyword.control.i3wm_config}
 
 # bar_hidden_state <show|hide|s|h>
 - name: bar_hidden_state
   match: (bar hidden_state)\s*(show|hide|toggle)\s*(.*)?
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.language.i3wm_config}
 
@@ -628,6 +628,6 @@ patterns:
 - name: bar_mode
   match: (mode)\s*(dock|hide|invisible|toggle)\s*(.*)?
   captures:
-    '1': {name: keyword.other.i3wm_config}
+    '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
     '3': {name: constant.language.i3wm_config}
diff --git a/Syntax/i3wm_config.tmLanguage b/Syntax/i3wm_config.tmLanguage
index 6922fa5..49dc1ba 100644
--- a/Syntax/i3wm_config.tmLanguage
+++ b/Syntax/i3wm_config.tmLanguage
@@ -60,7 +60,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -79,7 +79,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -98,7 +98,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -117,7 +117,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -136,7 +136,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -146,7 +146,7 @@
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>4</key>
           <dict>
@@ -165,7 +165,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -175,7 +175,7 @@
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>4</key>
           <dict>
@@ -194,7 +194,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -213,7 +213,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -232,7 +232,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -251,7 +251,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -270,7 +270,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -294,7 +294,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -318,7 +318,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -347,7 +347,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -371,7 +371,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -395,7 +395,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -429,7 +429,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -463,7 +463,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -497,7 +497,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -531,7 +531,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -550,7 +550,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -569,7 +569,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -588,7 +588,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -607,7 +607,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -626,7 +626,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -645,7 +645,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -664,7 +664,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -683,7 +683,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -697,7 +697,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -716,7 +716,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -735,7 +735,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -773,7 +773,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -792,7 +792,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -811,7 +811,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -830,7 +830,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -849,7 +849,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -868,7 +868,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -887,7 +887,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -906,7 +906,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -925,7 +925,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -944,7 +944,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -963,7 +963,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -997,7 +997,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1031,7 +1031,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1065,7 +1065,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1099,7 +1099,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1123,7 +1123,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1147,7 +1147,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1166,7 +1166,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1185,7 +1185,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1204,7 +1204,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1223,7 +1223,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1242,7 +1242,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1261,7 +1261,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1300,7 +1300,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1369,7 +1369,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1388,7 +1388,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1398,7 +1398,7 @@
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>4</key>
           <dict>
@@ -1422,22 +1422,22 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>4</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>5</key>
           <dict>
@@ -1456,12 +1456,12 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>3</key>
           <dict>
@@ -1480,17 +1480,17 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -1504,7 +1504,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1523,7 +1523,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1572,7 +1572,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1591,7 +1591,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -1605,7 +1605,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1624,7 +1624,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1643,7 +1643,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1667,7 +1667,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1691,7 +1691,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -1705,7 +1705,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -1719,7 +1719,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -1733,12 +1733,12 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -1752,12 +1752,12 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -1771,7 +1771,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
@@ -1795,7 +1795,7 @@
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>keyword.other.i3wm_config</string>
+            <string>keyword.control.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>