Fixed formatting errors resulting from theme change