Fixing up version 2 styles