Theme Testing Updated