Cleaned up structs + added missing from X11