Only change first match of @context for the commands. Changed: U trunk/Bundles/GTDAlt.tmbundle/Commands/Select Context.tmCommand U trunk/Bundles/GTDAlt.tmbundle/Commands/change context.tmCommand U trunk/Bundles/GTDAlt.tmbundle/Commands/choose context.tmCommand U trunk/Bundles/GTDAlt.tmbundle/Snippets/new action.tmSnippet