Merge css BB, fix switches