normalize theme changes part 2