theme final fixes day 2