fix theme bugs from my meddling