Additional cleanups in standard themes.