Adding additional changes for Uno theme--which is awesome.