updated settings and moved them to own namespace (to not conflict with master development)