Rename CSS Helpers, fix bugs