Finish rest of renaming within CSS file and fix a couple of minor bugs.