Added XAP into slides, consolidated themes, improved readability