Tweak SpecialKey highlighting; expand shortforms