As energy technology evolves to meet demands for development and ecological sustainability, engineers need to have up-to-date skills and knowledge to meet the creative challenges our energy problems demand. However, current engineering thermodynamics textbooks are grounded in historical developments of the steam engine in Europe and subsequent fossil fuel technologies. A set of course modules has been designed to take a fresh look at the engineering knowledge and skills required for current and emerging energy challenges. Stand-alone modules facilitate integration with existing courses and curricula and are adaptable to a variety of settings. Modules employ innovative engineering pedagogies that foster student engagement. Because energy engineers will need the full range of capabilities outlined in ABET's learning outcomes, modules address outcomes not often addressed in conventional thermodynamics courses: design within realistic social and technical constraints, professional ethics, effective communication, understanding social contexts of engineering, lifelong learning, and a knowledge of contemporary issues. Modules also focus on policy analysis for energy technology selection, and incorporate contributions from the global South. The mini-workshop will demonstrate the use of the modules in core engineering courses. Participants will individually design a plan for implementing a module of their choice in one of their courses.