Added 3 more resets; changed guarded mixins to simple patterns