Added solid lights and tweaked blending