Ryan theme cleanup 2