#988 Theme improvements