(Bug 3714) Property and CSS clean-up
(Bug 3714) Fixed property names in themes.s2