some cleanup to fix theme bugs