some baggy theme fixes and enhancement: issue #479