Some more theme updates
Merge branch 'master' of https://github.com/ITS-UofIowa/fo_common