Forgot to stage the last time. Fixed broken includes and stylesheet, made xbithack work.