Added custom HTML tags and custom JS vars