Reposition stuffs
Merge remote-tracking branch 'origin/NewColor'