Adding Shatter Support to the x-server