Rename CSS, tweaks to user generator