Finished implementing Theme API