Working on fixing the colors
Merge branch 'develop' of github.com:pkerpedjiev/forna into develop