Modularize theme caps