Updates to the theme functions and styling