Updates to themes, partial completion of MAU-166