Updated previously unused theme functions for 2.x