Improved datalist templating (added theme tag and tempalte lookups)