re-added traits/gtkbutton additions