Added config changes and cleaned up color code