Add guards when using external tools
Reformat an if to be consistent with the rest of them
enxure that .xinitrc is looked for in $HOME