Added "custom-system-folders" plugin
Small fixes