Merge branch 'SalamandraDevs:main' into new-colors