Further modernization.

Now it is using the latest syntax that is clang only, and all methods
are modernized. I will find it some better image resources too.