Tag and Theme(partial) functionality added