general theme improvements