Fix subtracting theme states