Added shades and fixed name bug