Changes to support transition to Colemak