working theme change but still need to refactor it