Fixed Goyo toggle mapping