updated theme to work with custom attributes