Fixing and cleanup, added icons

Fixed an issue with it not working after the first time using it,
needed to clear away old colors. Changed the structure a little to something that made more sense for this.

Started trying to do better color detection but that will have to wait.