Added custom shapes rendering support. Cleaned up demo project