add themes and comment block