theme + context fixes