Preparing for major changes to css library