Minor code style updates to theme elements

Minor code style updates to theme elements