This chapter considers how popular music can be incorporated into undergraduate theory teaching, positing three approaches: the traditional (no popular music), the mild revision (some popular music but considered according to the features of classical music), and the fundamental revision (features of popular and classic music balanced as core topics). Analysis of two songs, Bad Company’s “Can’t Get Enough” and Deep Purple’s “Smoke on the Water” is used to compare and contrast these three approaches.