implement latest adwaita changes