DHEK17 - New area types #27
Refactor + prepare new toolbar