sync both themes with suite classic changes in SeaMonkey 2.13 cycle