updated ST keymap and options
fixed master