Working on fixing theme issue