Revert "Conflict"

This reverts commit 635f355677a384aac22954637a508d17d8597b9c.
Revert "ToonExtension"

This reverts commit 88d5bbe2a66ae5e78d5c67103295649d4058ef49.
Revert "Toolbars"

This reverts commit 06bd2cfd525edea8a93d7969fb6da8e93d55f53e.