improved parameter handling
implemented StyleWidget
fixed merge conflict