Fixes themeing issues