Fixed themes issue