adapt official design

still work in progress and highly experimental