fix theme and panel