sync both themes with classic theme changes in SeaMonkey 2.31 cycle