Theme : one more fix