fixing for themes & inverted