Improve folding expression

Now also folds inside text (not just headers) according to indentation.
Change mapping