Added theme hook
Added templates