Refactore and update output
Update output colors
Update picture