add x-tags and themeable toolbar