Improved template system and updated isotope
Merge branch 'dev'