account, theme fixes