fix theme functions