slightly more styles and renamed things