Expanded detection of 3D layout from filenames
Formatting