Add Camelia, adjust colors, various other tweaks