Fix generate.sh script and css
Resolve conflicts
Revert planet.yml