Fixed theme bugs.