Well there is a difference between making sets completely focused on civilians or mixing them with the soldiers. To me thats the best way to go about it, for a castle there should be at least a herald and servant.
If a released tavern includes an armed thief and a guard along with several villagers it could still be a good seller. Besides, the modern theme is mostly about civilians and its doing great.