fx - Recategorized the commands a bit.