Updates to put everything into the flat theme so that the image works.