Support for OLED based external controller
Fixed stupid merge conflict that shouldn't have occured (git couldn't catch a 7 being changed to a 5)