I believe there are now five farm types, depending on what you want to focus on, i.e. a fishing farm type with rivers, a mining farm type with a quarry area, a fighting farm type where monsters can spawn around your house etc.
I presume the layouts are still set, you just choose what kind of farm you want at the start. I'm all for more variety around the farm, if you look at my screenshots earlier in the thread I'm certainly not the type to go ham on turning everything to garden.
I guess this is becoming my primary podcast-listening-game again, sorry Rebel Galaxy and Blood Bowl.