sync both themes with SeaMonkey classic changes in SM 2.22 cycle