Fix theme changed Menu & item