add macro ublt/keys, highlight some personal macros
improve point/mark exchange function
some theme clean-ups