[us-commits] [ehb54/ultrascan3] c32962: Fix theme edge cases