Theme Fixed (Mostly)