Rollback removal of s5_theme property