Changed mixins to extends where appropriate

Signed-off-by: Dave <davidajberner@gmail.com>