TODO: Remove items already worked off
src: Rename typedef DisplayState to display_state_t