Updated values and support for Dark and Light