(Added) - templating and icons