New CSS structure and setup for v2