Add color, fold and new shortcut