[us-commits] [ehb54/ultrascan3] 2231f1: Fix theme for edge cases part2