Yet another attempt at handling XDG...

This time with a cability to fallback to our first layout version.