Tidied up config hooks a bit
Huge config option cleanup, migrated to hooks