fixed theme stuff