Puck mods

Puck style mods

Everything filed under style by its own author, ordered by how much it is used.