Added theme support to additional function
Prepared empty templates