Where ever there are arched doorways, I'd leave off the arch piece so that the owner could choose to customize themselves to put in arches, leave square or put in walls & doors.
Also would leave out the two inner doors so that owner could choose that option as well.
The fountain is just me playing around. See how it looks. Kinda looks outa place to me.