I like the idea about the fortress/town/village theming. That does indeed make a lot more sense than the current theming with the mechanics I'm going for
Glad to be of service!