diff --git a/data/tools/wesnoth-mode.el b/data/tools/wesnoth-mode.el
index 0c78fcec8ce..9032afa66fc 100644
--- a/data/tools/wesnoth-mode.el
+++ b/data/tools/wesnoth-mode.el
@@ -119,27 +119,27 @@ indent the line."
   (list
    "advances" "advancefrom" "ai" "allow_recruit" "and" "animation" "array"
    "attack" "attacks" "avoid" "binary_path" "bold" "campaign" "capture_village"
-   "choose""clear_variable" "colour_adjust" "command" "deaths" "defend"
+   "case" "choose" "clear_variable" "colour_adjust" "command" "deaths" "defend"
    "defends" "defense" "delay" "destination" "disallow_recruit" "do" "effect"
-   "else" "end_turn" "endlevel" "era" "event" "expenses" "filter" "filter_second"
-   "format" "frame" "game_config" "generator" "gold" "have_unit" "header"
-   "hide_unit" "if" "illuminated_time" "image" "img" "income" "italic" "item"
-   "jump" "kill" "killed" "label" "language" "leader_goal" "main_map" "menu"
-   "message" "mini_map" "missile_frame" "modifications" "modify_side"
-   "modify_turns" "move" "move_unit_fake" "movement_costs" "movetype"
-   "multiplayer" "multiplayer_side" "music" "not" "num_units" "object"
-   "objectives" "objective" "observers" "option" "or" "panel" "part"
-   "place_shroud" "position" "print" "protect_location" "protect_unit" "race"
-   "random" "recall" "recalls" "recruit" "recruits" "redraw" "ref"
-   "remove_shroud" "remove_unit_overlay" "removeitem" "replay" "replay_start"
-   "resistance" "resolution" "results" "role" "save" "scenario" "scroll"
-   "scroll_to" "scroll_to_unit" "section" "set_recruit" "set_variable" "side"
-   "side_playing" "snapshot" "sound" "source" "specials" "statistics" "status"
-   "stone" "store_gold" "store_locations" "store_starting_location"
-   "store_unit" "story" "target" "team" "teleport" "teleport_anim" "terrain"
-   "terrain_graphics" "test" "theme" "then" "tile" "time" "time_area"
+   "else" "end_turn" "endlevel" "era" "event" "expenses" "filter" 
+   "filter_second" "format" "frame" "game_config" "generator" "gold" 
+   "have_unit" "header" "hide_unit" "if" "illuminated_time" "image" "img" 
+   "income" "italic" "item" "jump" "kill" "killed" "label" "language" 
+   "leader_goal" "main_map" "menu" "message" "mini_map" "missile_frame" 
+   "modifications" "modify_side" "modify_turns" "move" "move_unit_fake" 
+   "movement_costs" "movetype" "multiplayer" "multiplayer_side" "music"
+   "not" "num_units" "object" "objectives" "objective" "observers" "option" 
+   "or" "panel" "part" "place_shroud" "position" "print" "protect_location" 
+   "protect_unit" "race" "random" "recall" "recalls" "recruit" "recruits" 
+   "redraw" "ref" "remove_shroud" "remove_unit_overlay" "removeitem" "replay" 
+   "replay_start" "resistance" "resolution" "results" "role" "save" "scenario" 
+   "scroll" "scroll_to" "scroll_to_unit" "section" "set_recruit" "set_variable"
+   "side" "side_playing" "snapshot" "sound" "source" "specials" "statistics"
+   "status" "stone" "store_gold" "store_locations" "store_starting_location"
+   "store_unit" "story" "switch" "target" "team" "teleport" "teleport_anim"
+   "terrain" "terrain_graphics" "test" "theme" "then" "tile" "time" "time_area"
    "time_of_day" "topic" "toplevel" "trait" "turn" "tutorial" "unhide_unit"
-   "unit" "unit" "unit_abilities" "unit_alignment" "unit_description"
+   "unit" "unit_type" "unit_abilities" "unit_alignment" "unit_description"
    "unit_hp" "unit_image" "unit_level" "unit_moves" "unit_overlay"
    "unit_profile" "unit_status" "unit_traits" "unit_type" "unit_weapons"
    "unit_xp" "units" "unstone" "unstore_unit" "upkeep" "variable" "variables"