removed copy/paste and added some readability
Revert "removed copy/paste and added some readability"

This reverts commit b42c677c48efcb6da4c054dfa497eef860b9b8fa.
color refactor and detail overhaul