Added focus-state, renamed hover-state mixin