Simplified code and fixed config
simplified and added lightness