Fixed theme bugs