Base 16 support
Merge branch 'master' into laptop-work-archvm