Fix formatting on Ponyo
Fix extra theme
Fix broken merge