theme removed and more
POI clarification