added self theme & content