Fix Goyo toggling
Add mapping for easy folding