Changed to short syntax
Added firefox to core