theme fixes from Roy