Adds a fish to the header
Merges conflicts
Fixes fonts