Updates to base theme