macro updates, new styles & shortcuts