Added basic 2D3D and moved a few configs around