The goal of this thesis is to provide the ideological and practical foundation for an improved approach to undergraduate theory and musicianship pedagogy. I will discuss the structure of conventional theory programs and explore problems inherent to traditional curriculum design. Problem-solving pedagogy, an approach rooted in creative composition and improvisation, will be presented as a complement to traditional theory pedagogy. Balancing problem-solving pedagogy with a more traditional pedagogical approach will provide a practical foundation for improving undergraduate theory and musicianship curricula.