I was almost done writing my blog post addressing the same issue! I'll give this a read to make sure I don't re-say anything you did. The state site generator I use (Hugo) also looks very similar to yours lol.