Fixed theme initialization