Final cleanup pass on the default theme.