Cleanup
Add sign colors