Moved hardcoded defaults into settings