Theme development phase 2