Styles management

Fix issues #94 and #95