Choosing the Political Ideology of your Custom Faction

I am really looking forward to the ability to create custom factions in this game. I made an incredible one for myself in Endless Space 1 and I want to replicate it as well as I can in Endless Space 2. The ability to pick different traits for one's custom faction still exists, and most likely, we will still have to pick a specific Major Faction's affinity as our own.

But say I want to make an empire that's good with ships. I give my empire Big Fleets, Fast Movement, and Diligent Workers, but I've used the Vodyani Affinity so I'm stuck with a Religious population even though one would think this empire would be more Industrialist. This is obviously a problem because I would have an empire who's laws don't reflect the empire's physical abilities.

So, when making our custom factions in Endless Space 2, can we have the ability to customize our own population's political ideology?

Each population I've seen in ES2 has 3 traits, and some of them have 4 now that the first patch has been released, that impact their political views. For example, the Cravers are Hawkish, Anti-Pacifist, Xenophobic, and now Anti-Environmentalist, the Vodyani are Spiritualist, Anti-Materialist, Fanatical, and also Wary, and so on. Can a system be put in place where we can pick those 3 or 4 traits ourselves when creating a custom empire?