Fix Theme Bug