new changes
Fixed merge
Moved scripts
new grey colors