Here's a WIP of the Season 2+ Energiser layout. Not much different except the relocation of the dilithium crystals to the floor structure in the engine room and takes up part of the deck below. The deck below the engine room happens to be the 7th deck in the engineering hull in my particular setup
I notice in this S2 setup that you've kept the old Alternative Factor
energiser room in - any thoughts on what it might do now that the crystals are no longer located there?