updated some extend rules & mixins