Moved style from type == 'foo' to 'foo' == type