Workaround for style not beeing applied directly
Merge branch 'style_workaround' into development
apply style of current state instead of always "STATE_NORMAL"
Merge branch 'style_workaround' into development