Ryan theme cleanup 8