Black and white design

pull changes to libs