Template macros fixed.
Images builder added.