Continued redesign
Merge branch 'v2' of https://github.com/tsurai/amber into v2