Split CSS styling, remove remaining bits of point naming