Re-add all previously commented out settings

Turns out that space limitation was not my issue :P