bunches of color changes, some other small format tweaks