CON-1993: Simplify styles