updated comments in themes and use a more unified layout
updated tags and use buttons