Revert to using HOSTNAME, fixed in xinitrc for SLIM
Add TODOs