theme final fixes day 1