Rebundled "extra" features in a single file
Add features for hideshow support