Fix Theme issue