Tidy up theme

I think I could go on forever tidying up this theme lol.