Theme improvements.