Work from today and yesterday

Theme pretty much complete.