Update to be compatible with master theme