Revert "Revert "Mix default filters with file filters.""

This reverts commit 0e5a34f16fdc0f1fc5985e4c33659f0c59afdbe2.

Conflicts:
	src/ThemePlus/ThemePlus.php