Preliminary Changes for SAS Theme