Update to support theme compatiblity