numericitem is now derived from thematic item and rehashed some includes to create smaller headers