some fixes on zarubi theme