-changed colors to match cafe mac better