WIP cleaning up styles with MK