add wedit logo and remove savorfull
fixed conflicts to merge