Addition of display modes + override (experimental)