Refactors and additional color functions