Reorder macros menu entries; Fix Theme separator color