fixed bugs and added color settings