Fix theme spacing

Related Github issues
None

Working branch
master