Updated to reflect theme feature changes