Second commit

Custom-colors modifications