improve plugins foldings