Add portrait to filename
Remove deprecated settings
Lighten table of contents