Revamp Modes module.