fix theme subtemplates

[erral]

Normalize theme subtemplates:

• Generate all three structures in the same way
• Create theme names using utility functions
• Update barceloneta dependencies in package.json