Merge "Fix even dimmer mappings + transition point" into main