- Fixed theme optimizer issues