Update to Christian's latest styling