Added folding settings and key mappings