Some cleanup and type select
Merge branch '8.x-1.x' of github.com:LennardWesterveld/paragraphs-d8 into 8.x-1.x