Add RomControl and Settings back in