sync both themes with SeaMonkey classic changes in 2.20 cycle