fixed filters and increased performance on all themes
merged master into project and included pipe in all themes
Merged master