fix theme bug

fix theme bug
cleanup

cleanup