Added shape based lights and light based sanity behaviour