Move attributes to theme system change section