Updated theming function for easy handling fields