Updated a few style handlers