Progress on adding themes