Fixed typo
Imrpoved template system and updated isotope
deleted olf isotope
Merge branch 'dev'