remove shadow
use orangeDarker
refactoring