595-21 Rework

Pushing my reworked 595-21 (Types page) to the master branch